From: Petr Viktorin Date: Sat, 9 Apr 2011 09:34:46 +0000 (+0300) Subject: Rename pokemon/cropped-pokemon to just pokemon/cropped X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/f89e9c63a69bbdc71b7bed7dd0f2395c29e407c2 Rename pokemon/cropped-pokemon to just pokemon/cropped --- diff --git a/pokedex/data/media/pokemon/cropped-pokemon/0.png b/pokedex/data/media/pokemon/cropped/0.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/0.png rename to pokedex/data/media/pokemon/cropped/0.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/1.png b/pokedex/data/media/pokemon/cropped/1.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/1.png rename to pokedex/data/media/pokemon/cropped/1.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/10.png b/pokedex/data/media/pokemon/cropped/10.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/10.png rename to pokedex/data/media/pokemon/cropped/10.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/100.png b/pokedex/data/media/pokemon/cropped/100.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/100.png rename to pokedex/data/media/pokemon/cropped/100.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/101.png b/pokedex/data/media/pokemon/cropped/101.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/101.png rename to pokedex/data/media/pokemon/cropped/101.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/102.png b/pokedex/data/media/pokemon/cropped/102.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/102.png rename to pokedex/data/media/pokemon/cropped/102.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/103.png b/pokedex/data/media/pokemon/cropped/103.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/103.png rename to pokedex/data/media/pokemon/cropped/103.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/104.png b/pokedex/data/media/pokemon/cropped/104.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/104.png rename to pokedex/data/media/pokemon/cropped/104.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/105.png b/pokedex/data/media/pokemon/cropped/105.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/105.png rename to pokedex/data/media/pokemon/cropped/105.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/106.png b/pokedex/data/media/pokemon/cropped/106.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/106.png rename to pokedex/data/media/pokemon/cropped/106.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/107.png b/pokedex/data/media/pokemon/cropped/107.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/107.png rename to pokedex/data/media/pokemon/cropped/107.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/108.png b/pokedex/data/media/pokemon/cropped/108.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/108.png rename to pokedex/data/media/pokemon/cropped/108.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/109.png b/pokedex/data/media/pokemon/cropped/109.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/109.png rename to pokedex/data/media/pokemon/cropped/109.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/11.png b/pokedex/data/media/pokemon/cropped/11.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/11.png rename to pokedex/data/media/pokemon/cropped/11.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/110.png b/pokedex/data/media/pokemon/cropped/110.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/110.png rename to pokedex/data/media/pokemon/cropped/110.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/111.png b/pokedex/data/media/pokemon/cropped/111.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/111.png rename to pokedex/data/media/pokemon/cropped/111.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/112.png b/pokedex/data/media/pokemon/cropped/112.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/112.png rename to pokedex/data/media/pokemon/cropped/112.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/113.png b/pokedex/data/media/pokemon/cropped/113.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/113.png rename to pokedex/data/media/pokemon/cropped/113.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/114.png b/pokedex/data/media/pokemon/cropped/114.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/114.png rename to pokedex/data/media/pokemon/cropped/114.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/115.png b/pokedex/data/media/pokemon/cropped/115.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/115.png rename to pokedex/data/media/pokemon/cropped/115.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/116.png b/pokedex/data/media/pokemon/cropped/116.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/116.png rename to pokedex/data/media/pokemon/cropped/116.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/117.png b/pokedex/data/media/pokemon/cropped/117.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/117.png rename to pokedex/data/media/pokemon/cropped/117.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/118.png b/pokedex/data/media/pokemon/cropped/118.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/118.png rename to pokedex/data/media/pokemon/cropped/118.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/119.png b/pokedex/data/media/pokemon/cropped/119.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/119.png rename to pokedex/data/media/pokemon/cropped/119.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/12.png b/pokedex/data/media/pokemon/cropped/12.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/12.png rename to pokedex/data/media/pokemon/cropped/12.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/120.png b/pokedex/data/media/pokemon/cropped/120.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/120.png rename to pokedex/data/media/pokemon/cropped/120.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/121.png b/pokedex/data/media/pokemon/cropped/121.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/121.png rename to pokedex/data/media/pokemon/cropped/121.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/122.png b/pokedex/data/media/pokemon/cropped/122.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/122.png rename to pokedex/data/media/pokemon/cropped/122.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/123.png b/pokedex/data/media/pokemon/cropped/123.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/123.png rename to pokedex/data/media/pokemon/cropped/123.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/124.png b/pokedex/data/media/pokemon/cropped/124.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/124.png rename to pokedex/data/media/pokemon/cropped/124.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/125.png b/pokedex/data/media/pokemon/cropped/125.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/125.png rename to pokedex/data/media/pokemon/cropped/125.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/126.png b/pokedex/data/media/pokemon/cropped/126.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/126.png rename to pokedex/data/media/pokemon/cropped/126.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/127.png b/pokedex/data/media/pokemon/cropped/127.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/127.png rename to pokedex/data/media/pokemon/cropped/127.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/128.png b/pokedex/data/media/pokemon/cropped/128.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/128.png rename to pokedex/data/media/pokemon/cropped/128.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/129.png b/pokedex/data/media/pokemon/cropped/129.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/129.png rename to pokedex/data/media/pokemon/cropped/129.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/13.png b/pokedex/data/media/pokemon/cropped/13.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/13.png rename to pokedex/data/media/pokemon/cropped/13.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/130.png b/pokedex/data/media/pokemon/cropped/130.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/130.png rename to pokedex/data/media/pokemon/cropped/130.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/131.png b/pokedex/data/media/pokemon/cropped/131.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/131.png rename to pokedex/data/media/pokemon/cropped/131.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/132.png b/pokedex/data/media/pokemon/cropped/132.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/132.png rename to pokedex/data/media/pokemon/cropped/132.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/133.png b/pokedex/data/media/pokemon/cropped/133.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/133.png rename to pokedex/data/media/pokemon/cropped/133.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/134.png b/pokedex/data/media/pokemon/cropped/134.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/134.png rename to pokedex/data/media/pokemon/cropped/134.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/135.png b/pokedex/data/media/pokemon/cropped/135.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/135.png rename to pokedex/data/media/pokemon/cropped/135.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/136.png b/pokedex/data/media/pokemon/cropped/136.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/136.png rename to pokedex/data/media/pokemon/cropped/136.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/137.png b/pokedex/data/media/pokemon/cropped/137.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/137.png rename to pokedex/data/media/pokemon/cropped/137.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/138.png b/pokedex/data/media/pokemon/cropped/138.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/138.png rename to pokedex/data/media/pokemon/cropped/138.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/139.png b/pokedex/data/media/pokemon/cropped/139.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/139.png rename to pokedex/data/media/pokemon/cropped/139.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/14.png b/pokedex/data/media/pokemon/cropped/14.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/14.png rename to pokedex/data/media/pokemon/cropped/14.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/140.png b/pokedex/data/media/pokemon/cropped/140.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/140.png rename to pokedex/data/media/pokemon/cropped/140.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/141.png b/pokedex/data/media/pokemon/cropped/141.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/141.png rename to pokedex/data/media/pokemon/cropped/141.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/142.png b/pokedex/data/media/pokemon/cropped/142.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/142.png rename to pokedex/data/media/pokemon/cropped/142.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/143.png b/pokedex/data/media/pokemon/cropped/143.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/143.png rename to pokedex/data/media/pokemon/cropped/143.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/144.png b/pokedex/data/media/pokemon/cropped/144.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/144.png rename to pokedex/data/media/pokemon/cropped/144.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/145.png b/pokedex/data/media/pokemon/cropped/145.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/145.png rename to pokedex/data/media/pokemon/cropped/145.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/146.png b/pokedex/data/media/pokemon/cropped/146.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/146.png rename to pokedex/data/media/pokemon/cropped/146.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/147.png b/pokedex/data/media/pokemon/cropped/147.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/147.png rename to pokedex/data/media/pokemon/cropped/147.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/148.png b/pokedex/data/media/pokemon/cropped/148.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/148.png rename to pokedex/data/media/pokemon/cropped/148.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/149.png b/pokedex/data/media/pokemon/cropped/149.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/149.png rename to pokedex/data/media/pokemon/cropped/149.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/15.png b/pokedex/data/media/pokemon/cropped/15.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/15.png rename to pokedex/data/media/pokemon/cropped/15.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/150.png b/pokedex/data/media/pokemon/cropped/150.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/150.png rename to pokedex/data/media/pokemon/cropped/150.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/151.png b/pokedex/data/media/pokemon/cropped/151.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/151.png rename to pokedex/data/media/pokemon/cropped/151.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/152.png b/pokedex/data/media/pokemon/cropped/152.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/152.png rename to pokedex/data/media/pokemon/cropped/152.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/153.png b/pokedex/data/media/pokemon/cropped/153.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/153.png rename to pokedex/data/media/pokemon/cropped/153.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/154.png b/pokedex/data/media/pokemon/cropped/154.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/154.png rename to pokedex/data/media/pokemon/cropped/154.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/155.png b/pokedex/data/media/pokemon/cropped/155.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/155.png rename to pokedex/data/media/pokemon/cropped/155.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/156.png b/pokedex/data/media/pokemon/cropped/156.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/156.png rename to pokedex/data/media/pokemon/cropped/156.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/157.png b/pokedex/data/media/pokemon/cropped/157.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/157.png rename to pokedex/data/media/pokemon/cropped/157.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/158.png b/pokedex/data/media/pokemon/cropped/158.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/158.png rename to pokedex/data/media/pokemon/cropped/158.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/159.png b/pokedex/data/media/pokemon/cropped/159.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/159.png rename to pokedex/data/media/pokemon/cropped/159.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/16.png b/pokedex/data/media/pokemon/cropped/16.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/16.png rename to pokedex/data/media/pokemon/cropped/16.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/160.png b/pokedex/data/media/pokemon/cropped/160.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/160.png rename to pokedex/data/media/pokemon/cropped/160.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/161.png b/pokedex/data/media/pokemon/cropped/161.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/161.png rename to pokedex/data/media/pokemon/cropped/161.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/162.png b/pokedex/data/media/pokemon/cropped/162.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/162.png rename to pokedex/data/media/pokemon/cropped/162.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/163.png b/pokedex/data/media/pokemon/cropped/163.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/163.png rename to pokedex/data/media/pokemon/cropped/163.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/164.png b/pokedex/data/media/pokemon/cropped/164.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/164.png rename to pokedex/data/media/pokemon/cropped/164.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/165.png b/pokedex/data/media/pokemon/cropped/165.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/165.png rename to pokedex/data/media/pokemon/cropped/165.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/166.png b/pokedex/data/media/pokemon/cropped/166.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/166.png rename to pokedex/data/media/pokemon/cropped/166.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/167.png b/pokedex/data/media/pokemon/cropped/167.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/167.png rename to pokedex/data/media/pokemon/cropped/167.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/168.png b/pokedex/data/media/pokemon/cropped/168.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/168.png rename to pokedex/data/media/pokemon/cropped/168.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/169.png b/pokedex/data/media/pokemon/cropped/169.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/169.png rename to pokedex/data/media/pokemon/cropped/169.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/17.png b/pokedex/data/media/pokemon/cropped/17.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/17.png rename to pokedex/data/media/pokemon/cropped/17.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/170.png b/pokedex/data/media/pokemon/cropped/170.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/170.png rename to pokedex/data/media/pokemon/cropped/170.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/171.png b/pokedex/data/media/pokemon/cropped/171.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/171.png rename to pokedex/data/media/pokemon/cropped/171.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/172-spiky-eared.png b/pokedex/data/media/pokemon/cropped/172-spiky-eared.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/172-spiky-eared.png rename to pokedex/data/media/pokemon/cropped/172-spiky-eared.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/172.png b/pokedex/data/media/pokemon/cropped/172.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/172.png rename to pokedex/data/media/pokemon/cropped/172.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/173.png b/pokedex/data/media/pokemon/cropped/173.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/173.png rename to pokedex/data/media/pokemon/cropped/173.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/174.png b/pokedex/data/media/pokemon/cropped/174.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/174.png rename to pokedex/data/media/pokemon/cropped/174.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/175.png b/pokedex/data/media/pokemon/cropped/175.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/175.png rename to pokedex/data/media/pokemon/cropped/175.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/176.png b/pokedex/data/media/pokemon/cropped/176.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/176.png rename to pokedex/data/media/pokemon/cropped/176.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/177.png b/pokedex/data/media/pokemon/cropped/177.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/177.png rename to pokedex/data/media/pokemon/cropped/177.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/178.png b/pokedex/data/media/pokemon/cropped/178.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/178.png rename to pokedex/data/media/pokemon/cropped/178.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/179.png b/pokedex/data/media/pokemon/cropped/179.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/179.png rename to pokedex/data/media/pokemon/cropped/179.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/18.png b/pokedex/data/media/pokemon/cropped/18.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/18.png rename to pokedex/data/media/pokemon/cropped/18.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/180.png b/pokedex/data/media/pokemon/cropped/180.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/180.png rename to pokedex/data/media/pokemon/cropped/180.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/181.png b/pokedex/data/media/pokemon/cropped/181.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/181.png rename to pokedex/data/media/pokemon/cropped/181.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/182.png b/pokedex/data/media/pokemon/cropped/182.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/182.png rename to pokedex/data/media/pokemon/cropped/182.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/183.png b/pokedex/data/media/pokemon/cropped/183.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/183.png rename to pokedex/data/media/pokemon/cropped/183.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/184.png b/pokedex/data/media/pokemon/cropped/184.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/184.png rename to pokedex/data/media/pokemon/cropped/184.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/185.png b/pokedex/data/media/pokemon/cropped/185.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/185.png rename to pokedex/data/media/pokemon/cropped/185.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/186.png b/pokedex/data/media/pokemon/cropped/186.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/186.png rename to pokedex/data/media/pokemon/cropped/186.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/187.png b/pokedex/data/media/pokemon/cropped/187.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/187.png rename to pokedex/data/media/pokemon/cropped/187.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/188.png b/pokedex/data/media/pokemon/cropped/188.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/188.png rename to pokedex/data/media/pokemon/cropped/188.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/189.png b/pokedex/data/media/pokemon/cropped/189.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/189.png rename to pokedex/data/media/pokemon/cropped/189.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/19.png b/pokedex/data/media/pokemon/cropped/19.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/19.png rename to pokedex/data/media/pokemon/cropped/19.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/190.png b/pokedex/data/media/pokemon/cropped/190.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/190.png rename to pokedex/data/media/pokemon/cropped/190.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/191.png b/pokedex/data/media/pokemon/cropped/191.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/191.png rename to pokedex/data/media/pokemon/cropped/191.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/192.png b/pokedex/data/media/pokemon/cropped/192.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/192.png rename to pokedex/data/media/pokemon/cropped/192.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/193.png b/pokedex/data/media/pokemon/cropped/193.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/193.png rename to pokedex/data/media/pokemon/cropped/193.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/194.png b/pokedex/data/media/pokemon/cropped/194.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/194.png rename to pokedex/data/media/pokemon/cropped/194.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/195.png b/pokedex/data/media/pokemon/cropped/195.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/195.png rename to pokedex/data/media/pokemon/cropped/195.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/196.png b/pokedex/data/media/pokemon/cropped/196.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/196.png rename to pokedex/data/media/pokemon/cropped/196.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/197.png b/pokedex/data/media/pokemon/cropped/197.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/197.png rename to pokedex/data/media/pokemon/cropped/197.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/198.png b/pokedex/data/media/pokemon/cropped/198.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/198.png rename to pokedex/data/media/pokemon/cropped/198.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/199.png b/pokedex/data/media/pokemon/cropped/199.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/199.png rename to pokedex/data/media/pokemon/cropped/199.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/2.png b/pokedex/data/media/pokemon/cropped/2.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/2.png rename to pokedex/data/media/pokemon/cropped/2.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/20.png b/pokedex/data/media/pokemon/cropped/20.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/20.png rename to pokedex/data/media/pokemon/cropped/20.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/200.png b/pokedex/data/media/pokemon/cropped/200.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/200.png rename to pokedex/data/media/pokemon/cropped/200.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-a.png b/pokedex/data/media/pokemon/cropped/201-a.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-a.png rename to pokedex/data/media/pokemon/cropped/201-a.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-b.png b/pokedex/data/media/pokemon/cropped/201-b.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-b.png rename to pokedex/data/media/pokemon/cropped/201-b.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-c.png b/pokedex/data/media/pokemon/cropped/201-c.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-c.png rename to pokedex/data/media/pokemon/cropped/201-c.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-d.png b/pokedex/data/media/pokemon/cropped/201-d.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-d.png rename to pokedex/data/media/pokemon/cropped/201-d.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-e.png b/pokedex/data/media/pokemon/cropped/201-e.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-e.png rename to pokedex/data/media/pokemon/cropped/201-e.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-exclamation.png b/pokedex/data/media/pokemon/cropped/201-exclamation.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-exclamation.png rename to pokedex/data/media/pokemon/cropped/201-exclamation.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-f.png b/pokedex/data/media/pokemon/cropped/201-f.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-f.png rename to pokedex/data/media/pokemon/cropped/201-f.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-g.png b/pokedex/data/media/pokemon/cropped/201-g.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-g.png rename to pokedex/data/media/pokemon/cropped/201-g.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-h.png b/pokedex/data/media/pokemon/cropped/201-h.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-h.png rename to pokedex/data/media/pokemon/cropped/201-h.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-i.png b/pokedex/data/media/pokemon/cropped/201-i.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-i.png rename to pokedex/data/media/pokemon/cropped/201-i.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-j.png b/pokedex/data/media/pokemon/cropped/201-j.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-j.png rename to pokedex/data/media/pokemon/cropped/201-j.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-k.png b/pokedex/data/media/pokemon/cropped/201-k.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-k.png rename to pokedex/data/media/pokemon/cropped/201-k.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-l.png b/pokedex/data/media/pokemon/cropped/201-l.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-l.png rename to pokedex/data/media/pokemon/cropped/201-l.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-m.png b/pokedex/data/media/pokemon/cropped/201-m.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-m.png rename to pokedex/data/media/pokemon/cropped/201-m.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-n.png b/pokedex/data/media/pokemon/cropped/201-n.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-n.png rename to pokedex/data/media/pokemon/cropped/201-n.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-o.png b/pokedex/data/media/pokemon/cropped/201-o.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-o.png rename to pokedex/data/media/pokemon/cropped/201-o.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-p.png b/pokedex/data/media/pokemon/cropped/201-p.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-p.png rename to pokedex/data/media/pokemon/cropped/201-p.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-q.png b/pokedex/data/media/pokemon/cropped/201-q.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-q.png rename to pokedex/data/media/pokemon/cropped/201-q.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-question.png b/pokedex/data/media/pokemon/cropped/201-question.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-question.png rename to pokedex/data/media/pokemon/cropped/201-question.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-r.png b/pokedex/data/media/pokemon/cropped/201-r.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-r.png rename to pokedex/data/media/pokemon/cropped/201-r.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-s.png b/pokedex/data/media/pokemon/cropped/201-s.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-s.png rename to pokedex/data/media/pokemon/cropped/201-s.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-t.png b/pokedex/data/media/pokemon/cropped/201-t.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-t.png rename to pokedex/data/media/pokemon/cropped/201-t.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-u.png b/pokedex/data/media/pokemon/cropped/201-u.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-u.png rename to pokedex/data/media/pokemon/cropped/201-u.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-v.png b/pokedex/data/media/pokemon/cropped/201-v.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-v.png rename to pokedex/data/media/pokemon/cropped/201-v.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-w.png b/pokedex/data/media/pokemon/cropped/201-w.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-w.png rename to pokedex/data/media/pokemon/cropped/201-w.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-x.png b/pokedex/data/media/pokemon/cropped/201-x.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-x.png rename to pokedex/data/media/pokemon/cropped/201-x.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-y.png b/pokedex/data/media/pokemon/cropped/201-y.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-y.png rename to pokedex/data/media/pokemon/cropped/201-y.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201-z.png b/pokedex/data/media/pokemon/cropped/201-z.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201-z.png rename to pokedex/data/media/pokemon/cropped/201-z.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/201.png b/pokedex/data/media/pokemon/cropped/201.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/201.png rename to pokedex/data/media/pokemon/cropped/201.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/202.png b/pokedex/data/media/pokemon/cropped/202.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/202.png rename to pokedex/data/media/pokemon/cropped/202.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/203.png b/pokedex/data/media/pokemon/cropped/203.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/203.png rename to pokedex/data/media/pokemon/cropped/203.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/204.png b/pokedex/data/media/pokemon/cropped/204.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/204.png rename to pokedex/data/media/pokemon/cropped/204.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/205.png b/pokedex/data/media/pokemon/cropped/205.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/205.png rename to pokedex/data/media/pokemon/cropped/205.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/206.png b/pokedex/data/media/pokemon/cropped/206.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/206.png rename to pokedex/data/media/pokemon/cropped/206.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/207.png b/pokedex/data/media/pokemon/cropped/207.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/207.png rename to pokedex/data/media/pokemon/cropped/207.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/208.png b/pokedex/data/media/pokemon/cropped/208.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/208.png rename to pokedex/data/media/pokemon/cropped/208.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/209.png b/pokedex/data/media/pokemon/cropped/209.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/209.png rename to pokedex/data/media/pokemon/cropped/209.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/21.png b/pokedex/data/media/pokemon/cropped/21.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/21.png rename to pokedex/data/media/pokemon/cropped/21.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/210.png b/pokedex/data/media/pokemon/cropped/210.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/210.png rename to pokedex/data/media/pokemon/cropped/210.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/211.png b/pokedex/data/media/pokemon/cropped/211.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/211.png rename to pokedex/data/media/pokemon/cropped/211.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/212.png b/pokedex/data/media/pokemon/cropped/212.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/212.png rename to pokedex/data/media/pokemon/cropped/212.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/213.png b/pokedex/data/media/pokemon/cropped/213.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/213.png rename to pokedex/data/media/pokemon/cropped/213.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/214.png b/pokedex/data/media/pokemon/cropped/214.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/214.png rename to pokedex/data/media/pokemon/cropped/214.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/215.png b/pokedex/data/media/pokemon/cropped/215.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/215.png rename to pokedex/data/media/pokemon/cropped/215.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/216.png b/pokedex/data/media/pokemon/cropped/216.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/216.png rename to pokedex/data/media/pokemon/cropped/216.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/217.png b/pokedex/data/media/pokemon/cropped/217.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/217.png rename to pokedex/data/media/pokemon/cropped/217.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/218.png b/pokedex/data/media/pokemon/cropped/218.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/218.png rename to pokedex/data/media/pokemon/cropped/218.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/219.png b/pokedex/data/media/pokemon/cropped/219.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/219.png rename to pokedex/data/media/pokemon/cropped/219.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/22.png b/pokedex/data/media/pokemon/cropped/22.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/22.png rename to pokedex/data/media/pokemon/cropped/22.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/220.png b/pokedex/data/media/pokemon/cropped/220.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/220.png rename to pokedex/data/media/pokemon/cropped/220.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/221.png b/pokedex/data/media/pokemon/cropped/221.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/221.png rename to pokedex/data/media/pokemon/cropped/221.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/222.png b/pokedex/data/media/pokemon/cropped/222.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/222.png rename to pokedex/data/media/pokemon/cropped/222.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/223.png b/pokedex/data/media/pokemon/cropped/223.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/223.png rename to pokedex/data/media/pokemon/cropped/223.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/224.png b/pokedex/data/media/pokemon/cropped/224.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/224.png rename to pokedex/data/media/pokemon/cropped/224.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/225.png b/pokedex/data/media/pokemon/cropped/225.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/225.png rename to pokedex/data/media/pokemon/cropped/225.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/226.png b/pokedex/data/media/pokemon/cropped/226.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/226.png rename to pokedex/data/media/pokemon/cropped/226.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/227.png b/pokedex/data/media/pokemon/cropped/227.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/227.png rename to pokedex/data/media/pokemon/cropped/227.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/228.png b/pokedex/data/media/pokemon/cropped/228.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/228.png rename to pokedex/data/media/pokemon/cropped/228.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/229.png b/pokedex/data/media/pokemon/cropped/229.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/229.png rename to pokedex/data/media/pokemon/cropped/229.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/23.png b/pokedex/data/media/pokemon/cropped/23.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/23.png rename to pokedex/data/media/pokemon/cropped/23.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/230.png b/pokedex/data/media/pokemon/cropped/230.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/230.png rename to pokedex/data/media/pokemon/cropped/230.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/231.png b/pokedex/data/media/pokemon/cropped/231.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/231.png rename to pokedex/data/media/pokemon/cropped/231.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/232.png b/pokedex/data/media/pokemon/cropped/232.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/232.png rename to pokedex/data/media/pokemon/cropped/232.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/233.png b/pokedex/data/media/pokemon/cropped/233.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/233.png rename to pokedex/data/media/pokemon/cropped/233.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/234.png b/pokedex/data/media/pokemon/cropped/234.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/234.png rename to pokedex/data/media/pokemon/cropped/234.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/235.png b/pokedex/data/media/pokemon/cropped/235.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/235.png rename to pokedex/data/media/pokemon/cropped/235.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/236.png b/pokedex/data/media/pokemon/cropped/236.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/236.png rename to pokedex/data/media/pokemon/cropped/236.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/237.png b/pokedex/data/media/pokemon/cropped/237.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/237.png rename to pokedex/data/media/pokemon/cropped/237.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/238.png b/pokedex/data/media/pokemon/cropped/238.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/238.png rename to pokedex/data/media/pokemon/cropped/238.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/239.png b/pokedex/data/media/pokemon/cropped/239.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/239.png rename to pokedex/data/media/pokemon/cropped/239.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/24.png b/pokedex/data/media/pokemon/cropped/24.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/24.png rename to pokedex/data/media/pokemon/cropped/24.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/240.png b/pokedex/data/media/pokemon/cropped/240.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/240.png rename to pokedex/data/media/pokemon/cropped/240.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/241.png b/pokedex/data/media/pokemon/cropped/241.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/241.png rename to pokedex/data/media/pokemon/cropped/241.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/242.png b/pokedex/data/media/pokemon/cropped/242.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/242.png rename to pokedex/data/media/pokemon/cropped/242.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/243.png b/pokedex/data/media/pokemon/cropped/243.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/243.png rename to pokedex/data/media/pokemon/cropped/243.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/244.png b/pokedex/data/media/pokemon/cropped/244.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/244.png rename to pokedex/data/media/pokemon/cropped/244.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/245.png b/pokedex/data/media/pokemon/cropped/245.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/245.png rename to pokedex/data/media/pokemon/cropped/245.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/246.png b/pokedex/data/media/pokemon/cropped/246.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/246.png rename to pokedex/data/media/pokemon/cropped/246.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/247.png b/pokedex/data/media/pokemon/cropped/247.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/247.png rename to pokedex/data/media/pokemon/cropped/247.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/248.png b/pokedex/data/media/pokemon/cropped/248.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/248.png rename to pokedex/data/media/pokemon/cropped/248.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/249.png b/pokedex/data/media/pokemon/cropped/249.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/249.png rename to pokedex/data/media/pokemon/cropped/249.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/25.png b/pokedex/data/media/pokemon/cropped/25.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/25.png rename to pokedex/data/media/pokemon/cropped/25.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/250.png b/pokedex/data/media/pokemon/cropped/250.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/250.png rename to pokedex/data/media/pokemon/cropped/250.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/251.png b/pokedex/data/media/pokemon/cropped/251.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/251.png rename to pokedex/data/media/pokemon/cropped/251.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/252.png b/pokedex/data/media/pokemon/cropped/252.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/252.png rename to pokedex/data/media/pokemon/cropped/252.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/253.png b/pokedex/data/media/pokemon/cropped/253.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/253.png rename to pokedex/data/media/pokemon/cropped/253.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/254.png b/pokedex/data/media/pokemon/cropped/254.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/254.png rename to pokedex/data/media/pokemon/cropped/254.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/255.png b/pokedex/data/media/pokemon/cropped/255.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/255.png rename to pokedex/data/media/pokemon/cropped/255.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/256.png b/pokedex/data/media/pokemon/cropped/256.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/256.png rename to pokedex/data/media/pokemon/cropped/256.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/257.png b/pokedex/data/media/pokemon/cropped/257.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/257.png rename to pokedex/data/media/pokemon/cropped/257.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/258.png b/pokedex/data/media/pokemon/cropped/258.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/258.png rename to pokedex/data/media/pokemon/cropped/258.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/259.png b/pokedex/data/media/pokemon/cropped/259.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/259.png rename to pokedex/data/media/pokemon/cropped/259.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/26.png b/pokedex/data/media/pokemon/cropped/26.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/26.png rename to pokedex/data/media/pokemon/cropped/26.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/260.png b/pokedex/data/media/pokemon/cropped/260.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/260.png rename to pokedex/data/media/pokemon/cropped/260.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/261.png b/pokedex/data/media/pokemon/cropped/261.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/261.png rename to pokedex/data/media/pokemon/cropped/261.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/262.png b/pokedex/data/media/pokemon/cropped/262.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/262.png rename to pokedex/data/media/pokemon/cropped/262.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/263.png b/pokedex/data/media/pokemon/cropped/263.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/263.png rename to pokedex/data/media/pokemon/cropped/263.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/264.png b/pokedex/data/media/pokemon/cropped/264.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/264.png rename to pokedex/data/media/pokemon/cropped/264.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/265.png b/pokedex/data/media/pokemon/cropped/265.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/265.png rename to pokedex/data/media/pokemon/cropped/265.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/266.png b/pokedex/data/media/pokemon/cropped/266.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/266.png rename to pokedex/data/media/pokemon/cropped/266.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/267.png b/pokedex/data/media/pokemon/cropped/267.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/267.png rename to pokedex/data/media/pokemon/cropped/267.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/268.png b/pokedex/data/media/pokemon/cropped/268.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/268.png rename to pokedex/data/media/pokemon/cropped/268.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/269.png b/pokedex/data/media/pokemon/cropped/269.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/269.png rename to pokedex/data/media/pokemon/cropped/269.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/27.png b/pokedex/data/media/pokemon/cropped/27.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/27.png rename to pokedex/data/media/pokemon/cropped/27.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/270.png b/pokedex/data/media/pokemon/cropped/270.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/270.png rename to pokedex/data/media/pokemon/cropped/270.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/271.png b/pokedex/data/media/pokemon/cropped/271.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/271.png rename to pokedex/data/media/pokemon/cropped/271.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/272.png b/pokedex/data/media/pokemon/cropped/272.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/272.png rename to pokedex/data/media/pokemon/cropped/272.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/273.png b/pokedex/data/media/pokemon/cropped/273.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/273.png rename to pokedex/data/media/pokemon/cropped/273.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/274.png b/pokedex/data/media/pokemon/cropped/274.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/274.png rename to pokedex/data/media/pokemon/cropped/274.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/275.png b/pokedex/data/media/pokemon/cropped/275.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/275.png rename to pokedex/data/media/pokemon/cropped/275.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/276.png b/pokedex/data/media/pokemon/cropped/276.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/276.png rename to pokedex/data/media/pokemon/cropped/276.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/277.png b/pokedex/data/media/pokemon/cropped/277.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/277.png rename to pokedex/data/media/pokemon/cropped/277.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/278.png b/pokedex/data/media/pokemon/cropped/278.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/278.png rename to pokedex/data/media/pokemon/cropped/278.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/279.png b/pokedex/data/media/pokemon/cropped/279.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/279.png rename to pokedex/data/media/pokemon/cropped/279.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/28.png b/pokedex/data/media/pokemon/cropped/28.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/28.png rename to pokedex/data/media/pokemon/cropped/28.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/280.png b/pokedex/data/media/pokemon/cropped/280.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/280.png rename to pokedex/data/media/pokemon/cropped/280.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/281.png b/pokedex/data/media/pokemon/cropped/281.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/281.png rename to pokedex/data/media/pokemon/cropped/281.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/282.png b/pokedex/data/media/pokemon/cropped/282.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/282.png rename to pokedex/data/media/pokemon/cropped/282.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/283.png b/pokedex/data/media/pokemon/cropped/283.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/283.png rename to pokedex/data/media/pokemon/cropped/283.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/284.png b/pokedex/data/media/pokemon/cropped/284.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/284.png rename to pokedex/data/media/pokemon/cropped/284.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/285.png b/pokedex/data/media/pokemon/cropped/285.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/285.png rename to pokedex/data/media/pokemon/cropped/285.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/286.png b/pokedex/data/media/pokemon/cropped/286.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/286.png rename to pokedex/data/media/pokemon/cropped/286.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/287.png b/pokedex/data/media/pokemon/cropped/287.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/287.png rename to pokedex/data/media/pokemon/cropped/287.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/288.png b/pokedex/data/media/pokemon/cropped/288.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/288.png rename to pokedex/data/media/pokemon/cropped/288.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/289.png b/pokedex/data/media/pokemon/cropped/289.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/289.png rename to pokedex/data/media/pokemon/cropped/289.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/29.png b/pokedex/data/media/pokemon/cropped/29.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/29.png rename to pokedex/data/media/pokemon/cropped/29.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/290.png b/pokedex/data/media/pokemon/cropped/290.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/290.png rename to pokedex/data/media/pokemon/cropped/290.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/291.png b/pokedex/data/media/pokemon/cropped/291.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/291.png rename to pokedex/data/media/pokemon/cropped/291.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/292.png b/pokedex/data/media/pokemon/cropped/292.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/292.png rename to pokedex/data/media/pokemon/cropped/292.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/293.png b/pokedex/data/media/pokemon/cropped/293.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/293.png rename to pokedex/data/media/pokemon/cropped/293.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/294.png b/pokedex/data/media/pokemon/cropped/294.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/294.png rename to pokedex/data/media/pokemon/cropped/294.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/295.png b/pokedex/data/media/pokemon/cropped/295.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/295.png rename to pokedex/data/media/pokemon/cropped/295.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/296.png b/pokedex/data/media/pokemon/cropped/296.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/296.png rename to pokedex/data/media/pokemon/cropped/296.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/297.png b/pokedex/data/media/pokemon/cropped/297.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/297.png rename to pokedex/data/media/pokemon/cropped/297.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/298.png b/pokedex/data/media/pokemon/cropped/298.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/298.png rename to pokedex/data/media/pokemon/cropped/298.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/299.png b/pokedex/data/media/pokemon/cropped/299.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/299.png rename to pokedex/data/media/pokemon/cropped/299.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/3.png b/pokedex/data/media/pokemon/cropped/3.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/3.png rename to pokedex/data/media/pokemon/cropped/3.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/30.png b/pokedex/data/media/pokemon/cropped/30.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/30.png rename to pokedex/data/media/pokemon/cropped/30.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/300.png b/pokedex/data/media/pokemon/cropped/300.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/300.png rename to pokedex/data/media/pokemon/cropped/300.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/301.png b/pokedex/data/media/pokemon/cropped/301.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/301.png rename to pokedex/data/media/pokemon/cropped/301.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/302.png b/pokedex/data/media/pokemon/cropped/302.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/302.png rename to pokedex/data/media/pokemon/cropped/302.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/303.png b/pokedex/data/media/pokemon/cropped/303.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/303.png rename to pokedex/data/media/pokemon/cropped/303.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/304.png b/pokedex/data/media/pokemon/cropped/304.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/304.png rename to pokedex/data/media/pokemon/cropped/304.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/305.png b/pokedex/data/media/pokemon/cropped/305.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/305.png rename to pokedex/data/media/pokemon/cropped/305.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/306.png b/pokedex/data/media/pokemon/cropped/306.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/306.png rename to pokedex/data/media/pokemon/cropped/306.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/307.png b/pokedex/data/media/pokemon/cropped/307.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/307.png rename to pokedex/data/media/pokemon/cropped/307.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/308.png b/pokedex/data/media/pokemon/cropped/308.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/308.png rename to pokedex/data/media/pokemon/cropped/308.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/309.png b/pokedex/data/media/pokemon/cropped/309.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/309.png rename to pokedex/data/media/pokemon/cropped/309.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/31.png b/pokedex/data/media/pokemon/cropped/31.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/31.png rename to pokedex/data/media/pokemon/cropped/31.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/310.png b/pokedex/data/media/pokemon/cropped/310.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/310.png rename to pokedex/data/media/pokemon/cropped/310.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/311.png b/pokedex/data/media/pokemon/cropped/311.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/311.png rename to pokedex/data/media/pokemon/cropped/311.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/312.png b/pokedex/data/media/pokemon/cropped/312.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/312.png rename to pokedex/data/media/pokemon/cropped/312.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/313.png b/pokedex/data/media/pokemon/cropped/313.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/313.png rename to pokedex/data/media/pokemon/cropped/313.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/314.png b/pokedex/data/media/pokemon/cropped/314.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/314.png rename to pokedex/data/media/pokemon/cropped/314.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/315.png b/pokedex/data/media/pokemon/cropped/315.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/315.png rename to pokedex/data/media/pokemon/cropped/315.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/316.png b/pokedex/data/media/pokemon/cropped/316.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/316.png rename to pokedex/data/media/pokemon/cropped/316.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/317.png b/pokedex/data/media/pokemon/cropped/317.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/317.png rename to pokedex/data/media/pokemon/cropped/317.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/318.png b/pokedex/data/media/pokemon/cropped/318.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/318.png rename to pokedex/data/media/pokemon/cropped/318.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/319.png b/pokedex/data/media/pokemon/cropped/319.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/319.png rename to pokedex/data/media/pokemon/cropped/319.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/32.png b/pokedex/data/media/pokemon/cropped/32.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/32.png rename to pokedex/data/media/pokemon/cropped/32.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/320.png b/pokedex/data/media/pokemon/cropped/320.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/320.png rename to pokedex/data/media/pokemon/cropped/320.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/321.png b/pokedex/data/media/pokemon/cropped/321.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/321.png rename to pokedex/data/media/pokemon/cropped/321.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/322.png b/pokedex/data/media/pokemon/cropped/322.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/322.png rename to pokedex/data/media/pokemon/cropped/322.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/323.png b/pokedex/data/media/pokemon/cropped/323.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/323.png rename to pokedex/data/media/pokemon/cropped/323.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/324.png b/pokedex/data/media/pokemon/cropped/324.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/324.png rename to pokedex/data/media/pokemon/cropped/324.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/325.png b/pokedex/data/media/pokemon/cropped/325.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/325.png rename to pokedex/data/media/pokemon/cropped/325.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/326.png b/pokedex/data/media/pokemon/cropped/326.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/326.png rename to pokedex/data/media/pokemon/cropped/326.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/327.png b/pokedex/data/media/pokemon/cropped/327.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/327.png rename to pokedex/data/media/pokemon/cropped/327.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/328.png b/pokedex/data/media/pokemon/cropped/328.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/328.png rename to pokedex/data/media/pokemon/cropped/328.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/329.png b/pokedex/data/media/pokemon/cropped/329.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/329.png rename to pokedex/data/media/pokemon/cropped/329.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/33.png b/pokedex/data/media/pokemon/cropped/33.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/33.png rename to pokedex/data/media/pokemon/cropped/33.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/330.png b/pokedex/data/media/pokemon/cropped/330.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/330.png rename to pokedex/data/media/pokemon/cropped/330.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/331.png b/pokedex/data/media/pokemon/cropped/331.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/331.png rename to pokedex/data/media/pokemon/cropped/331.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/332.png b/pokedex/data/media/pokemon/cropped/332.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/332.png rename to pokedex/data/media/pokemon/cropped/332.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/333.png b/pokedex/data/media/pokemon/cropped/333.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/333.png rename to pokedex/data/media/pokemon/cropped/333.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/334.png b/pokedex/data/media/pokemon/cropped/334.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/334.png rename to pokedex/data/media/pokemon/cropped/334.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/335.png b/pokedex/data/media/pokemon/cropped/335.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/335.png rename to pokedex/data/media/pokemon/cropped/335.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/336.png b/pokedex/data/media/pokemon/cropped/336.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/336.png rename to pokedex/data/media/pokemon/cropped/336.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/337.png b/pokedex/data/media/pokemon/cropped/337.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/337.png rename to pokedex/data/media/pokemon/cropped/337.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/338.png b/pokedex/data/media/pokemon/cropped/338.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/338.png rename to pokedex/data/media/pokemon/cropped/338.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/339.png b/pokedex/data/media/pokemon/cropped/339.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/339.png rename to pokedex/data/media/pokemon/cropped/339.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/34.png b/pokedex/data/media/pokemon/cropped/34.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/34.png rename to pokedex/data/media/pokemon/cropped/34.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/340.png b/pokedex/data/media/pokemon/cropped/340.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/340.png rename to pokedex/data/media/pokemon/cropped/340.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/341.png b/pokedex/data/media/pokemon/cropped/341.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/341.png rename to pokedex/data/media/pokemon/cropped/341.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/342.png b/pokedex/data/media/pokemon/cropped/342.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/342.png rename to pokedex/data/media/pokemon/cropped/342.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/343.png b/pokedex/data/media/pokemon/cropped/343.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/343.png rename to pokedex/data/media/pokemon/cropped/343.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/344.png b/pokedex/data/media/pokemon/cropped/344.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/344.png rename to pokedex/data/media/pokemon/cropped/344.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/345.png b/pokedex/data/media/pokemon/cropped/345.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/345.png rename to pokedex/data/media/pokemon/cropped/345.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/346.png b/pokedex/data/media/pokemon/cropped/346.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/346.png rename to pokedex/data/media/pokemon/cropped/346.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/347.png b/pokedex/data/media/pokemon/cropped/347.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/347.png rename to pokedex/data/media/pokemon/cropped/347.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/348.png b/pokedex/data/media/pokemon/cropped/348.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/348.png rename to pokedex/data/media/pokemon/cropped/348.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/349.png b/pokedex/data/media/pokemon/cropped/349.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/349.png rename to pokedex/data/media/pokemon/cropped/349.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/35.png b/pokedex/data/media/pokemon/cropped/35.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/35.png rename to pokedex/data/media/pokemon/cropped/35.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/350.png b/pokedex/data/media/pokemon/cropped/350.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/350.png rename to pokedex/data/media/pokemon/cropped/350.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/351-rainy.png b/pokedex/data/media/pokemon/cropped/351-rainy.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/351-rainy.png rename to pokedex/data/media/pokemon/cropped/351-rainy.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/351-snowy.png b/pokedex/data/media/pokemon/cropped/351-snowy.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/351-snowy.png rename to pokedex/data/media/pokemon/cropped/351-snowy.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/351-sunny.png b/pokedex/data/media/pokemon/cropped/351-sunny.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/351-sunny.png rename to pokedex/data/media/pokemon/cropped/351-sunny.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/351.png b/pokedex/data/media/pokemon/cropped/351.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/351.png rename to pokedex/data/media/pokemon/cropped/351.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/352.png b/pokedex/data/media/pokemon/cropped/352.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/352.png rename to pokedex/data/media/pokemon/cropped/352.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/353.png b/pokedex/data/media/pokemon/cropped/353.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/353.png rename to pokedex/data/media/pokemon/cropped/353.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/354.png b/pokedex/data/media/pokemon/cropped/354.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/354.png rename to pokedex/data/media/pokemon/cropped/354.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/355.png b/pokedex/data/media/pokemon/cropped/355.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/355.png rename to pokedex/data/media/pokemon/cropped/355.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/356.png b/pokedex/data/media/pokemon/cropped/356.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/356.png rename to pokedex/data/media/pokemon/cropped/356.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/357.png b/pokedex/data/media/pokemon/cropped/357.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/357.png rename to pokedex/data/media/pokemon/cropped/357.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/358.png b/pokedex/data/media/pokemon/cropped/358.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/358.png rename to pokedex/data/media/pokemon/cropped/358.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/359.png b/pokedex/data/media/pokemon/cropped/359.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/359.png rename to pokedex/data/media/pokemon/cropped/359.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/36.png b/pokedex/data/media/pokemon/cropped/36.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/36.png rename to pokedex/data/media/pokemon/cropped/36.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/360.png b/pokedex/data/media/pokemon/cropped/360.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/360.png rename to pokedex/data/media/pokemon/cropped/360.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/361.png b/pokedex/data/media/pokemon/cropped/361.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/361.png rename to pokedex/data/media/pokemon/cropped/361.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/362.png b/pokedex/data/media/pokemon/cropped/362.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/362.png rename to pokedex/data/media/pokemon/cropped/362.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/363.png b/pokedex/data/media/pokemon/cropped/363.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/363.png rename to pokedex/data/media/pokemon/cropped/363.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/364.png b/pokedex/data/media/pokemon/cropped/364.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/364.png rename to pokedex/data/media/pokemon/cropped/364.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/365.png b/pokedex/data/media/pokemon/cropped/365.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/365.png rename to pokedex/data/media/pokemon/cropped/365.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/366.png b/pokedex/data/media/pokemon/cropped/366.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/366.png rename to pokedex/data/media/pokemon/cropped/366.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/367.png b/pokedex/data/media/pokemon/cropped/367.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/367.png rename to pokedex/data/media/pokemon/cropped/367.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/368.png b/pokedex/data/media/pokemon/cropped/368.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/368.png rename to pokedex/data/media/pokemon/cropped/368.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/369.png b/pokedex/data/media/pokemon/cropped/369.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/369.png rename to pokedex/data/media/pokemon/cropped/369.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/37.png b/pokedex/data/media/pokemon/cropped/37.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/37.png rename to pokedex/data/media/pokemon/cropped/37.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/370.png b/pokedex/data/media/pokemon/cropped/370.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/370.png rename to pokedex/data/media/pokemon/cropped/370.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/371.png b/pokedex/data/media/pokemon/cropped/371.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/371.png rename to pokedex/data/media/pokemon/cropped/371.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/372.png b/pokedex/data/media/pokemon/cropped/372.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/372.png rename to pokedex/data/media/pokemon/cropped/372.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/373.png b/pokedex/data/media/pokemon/cropped/373.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/373.png rename to pokedex/data/media/pokemon/cropped/373.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/374.png b/pokedex/data/media/pokemon/cropped/374.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/374.png rename to pokedex/data/media/pokemon/cropped/374.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/375.png b/pokedex/data/media/pokemon/cropped/375.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/375.png rename to pokedex/data/media/pokemon/cropped/375.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/376.png b/pokedex/data/media/pokemon/cropped/376.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/376.png rename to pokedex/data/media/pokemon/cropped/376.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/377.png b/pokedex/data/media/pokemon/cropped/377.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/377.png rename to pokedex/data/media/pokemon/cropped/377.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/378.png b/pokedex/data/media/pokemon/cropped/378.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/378.png rename to pokedex/data/media/pokemon/cropped/378.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/379.png b/pokedex/data/media/pokemon/cropped/379.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/379.png rename to pokedex/data/media/pokemon/cropped/379.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/38.png b/pokedex/data/media/pokemon/cropped/38.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/38.png rename to pokedex/data/media/pokemon/cropped/38.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/380.png b/pokedex/data/media/pokemon/cropped/380.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/380.png rename to pokedex/data/media/pokemon/cropped/380.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/381.png b/pokedex/data/media/pokemon/cropped/381.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/381.png rename to pokedex/data/media/pokemon/cropped/381.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/382.png b/pokedex/data/media/pokemon/cropped/382.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/382.png rename to pokedex/data/media/pokemon/cropped/382.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/383.png b/pokedex/data/media/pokemon/cropped/383.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/383.png rename to pokedex/data/media/pokemon/cropped/383.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/384.png b/pokedex/data/media/pokemon/cropped/384.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/384.png rename to pokedex/data/media/pokemon/cropped/384.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/385.png b/pokedex/data/media/pokemon/cropped/385.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/385.png rename to pokedex/data/media/pokemon/cropped/385.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/386-attack.png b/pokedex/data/media/pokemon/cropped/386-attack.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/386-attack.png rename to pokedex/data/media/pokemon/cropped/386-attack.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/386-defense.png b/pokedex/data/media/pokemon/cropped/386-defense.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/386-defense.png rename to pokedex/data/media/pokemon/cropped/386-defense.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/386-normal.png b/pokedex/data/media/pokemon/cropped/386-normal.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/386-normal.png rename to pokedex/data/media/pokemon/cropped/386-normal.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/386-speed.png b/pokedex/data/media/pokemon/cropped/386-speed.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/386-speed.png rename to pokedex/data/media/pokemon/cropped/386-speed.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/386.png b/pokedex/data/media/pokemon/cropped/386.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/386.png rename to pokedex/data/media/pokemon/cropped/386.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/387.png b/pokedex/data/media/pokemon/cropped/387.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/387.png rename to pokedex/data/media/pokemon/cropped/387.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/388.png b/pokedex/data/media/pokemon/cropped/388.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/388.png rename to pokedex/data/media/pokemon/cropped/388.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/389.png b/pokedex/data/media/pokemon/cropped/389.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/389.png rename to pokedex/data/media/pokemon/cropped/389.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/39.png b/pokedex/data/media/pokemon/cropped/39.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/39.png rename to pokedex/data/media/pokemon/cropped/39.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/390.png b/pokedex/data/media/pokemon/cropped/390.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/390.png rename to pokedex/data/media/pokemon/cropped/390.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/391.png b/pokedex/data/media/pokemon/cropped/391.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/391.png rename to pokedex/data/media/pokemon/cropped/391.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/392.png b/pokedex/data/media/pokemon/cropped/392.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/392.png rename to pokedex/data/media/pokemon/cropped/392.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/393.png b/pokedex/data/media/pokemon/cropped/393.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/393.png rename to pokedex/data/media/pokemon/cropped/393.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/394.png b/pokedex/data/media/pokemon/cropped/394.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/394.png rename to pokedex/data/media/pokemon/cropped/394.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/395.png b/pokedex/data/media/pokemon/cropped/395.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/395.png rename to pokedex/data/media/pokemon/cropped/395.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/396.png b/pokedex/data/media/pokemon/cropped/396.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/396.png rename to pokedex/data/media/pokemon/cropped/396.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/397.png b/pokedex/data/media/pokemon/cropped/397.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/397.png rename to pokedex/data/media/pokemon/cropped/397.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/398.png b/pokedex/data/media/pokemon/cropped/398.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/398.png rename to pokedex/data/media/pokemon/cropped/398.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/399.png b/pokedex/data/media/pokemon/cropped/399.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/399.png rename to pokedex/data/media/pokemon/cropped/399.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/4.png b/pokedex/data/media/pokemon/cropped/4.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/4.png rename to pokedex/data/media/pokemon/cropped/4.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/40.png b/pokedex/data/media/pokemon/cropped/40.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/40.png rename to pokedex/data/media/pokemon/cropped/40.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/400.png b/pokedex/data/media/pokemon/cropped/400.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/400.png rename to pokedex/data/media/pokemon/cropped/400.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/401.png b/pokedex/data/media/pokemon/cropped/401.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/401.png rename to pokedex/data/media/pokemon/cropped/401.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/402.png b/pokedex/data/media/pokemon/cropped/402.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/402.png rename to pokedex/data/media/pokemon/cropped/402.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/403.png b/pokedex/data/media/pokemon/cropped/403.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/403.png rename to pokedex/data/media/pokemon/cropped/403.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/404.png b/pokedex/data/media/pokemon/cropped/404.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/404.png rename to pokedex/data/media/pokemon/cropped/404.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/405.png b/pokedex/data/media/pokemon/cropped/405.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/405.png rename to pokedex/data/media/pokemon/cropped/405.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/406.png b/pokedex/data/media/pokemon/cropped/406.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/406.png rename to pokedex/data/media/pokemon/cropped/406.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/407.png b/pokedex/data/media/pokemon/cropped/407.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/407.png rename to pokedex/data/media/pokemon/cropped/407.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/408.png b/pokedex/data/media/pokemon/cropped/408.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/408.png rename to pokedex/data/media/pokemon/cropped/408.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/409.png b/pokedex/data/media/pokemon/cropped/409.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/409.png rename to pokedex/data/media/pokemon/cropped/409.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/41.png b/pokedex/data/media/pokemon/cropped/41.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/41.png rename to pokedex/data/media/pokemon/cropped/41.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/410.png b/pokedex/data/media/pokemon/cropped/410.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/410.png rename to pokedex/data/media/pokemon/cropped/410.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/411.png b/pokedex/data/media/pokemon/cropped/411.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/411.png rename to pokedex/data/media/pokemon/cropped/411.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/412-plant.png b/pokedex/data/media/pokemon/cropped/412-plant.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/412-plant.png rename to pokedex/data/media/pokemon/cropped/412-plant.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/412-sandy.png b/pokedex/data/media/pokemon/cropped/412-sandy.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/412-sandy.png rename to pokedex/data/media/pokemon/cropped/412-sandy.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/412-steel.png b/pokedex/data/media/pokemon/cropped/412-steel.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/412-steel.png rename to pokedex/data/media/pokemon/cropped/412-steel.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/412-trash.png b/pokedex/data/media/pokemon/cropped/412-trash.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/412-trash.png rename to pokedex/data/media/pokemon/cropped/412-trash.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/412.png b/pokedex/data/media/pokemon/cropped/412.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/412.png rename to pokedex/data/media/pokemon/cropped/412.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/413-plant.png b/pokedex/data/media/pokemon/cropped/413-plant.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/413-plant.png rename to pokedex/data/media/pokemon/cropped/413-plant.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/413-sandy.png b/pokedex/data/media/pokemon/cropped/413-sandy.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/413-sandy.png rename to pokedex/data/media/pokemon/cropped/413-sandy.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/413-steel.png b/pokedex/data/media/pokemon/cropped/413-steel.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/413-steel.png rename to pokedex/data/media/pokemon/cropped/413-steel.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/413-trash.png b/pokedex/data/media/pokemon/cropped/413-trash.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/413-trash.png rename to pokedex/data/media/pokemon/cropped/413-trash.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/413.png b/pokedex/data/media/pokemon/cropped/413.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/413.png rename to pokedex/data/media/pokemon/cropped/413.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/414.png b/pokedex/data/media/pokemon/cropped/414.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/414.png rename to pokedex/data/media/pokemon/cropped/414.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/415.png b/pokedex/data/media/pokemon/cropped/415.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/415.png rename to pokedex/data/media/pokemon/cropped/415.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/416.png b/pokedex/data/media/pokemon/cropped/416.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/416.png rename to pokedex/data/media/pokemon/cropped/416.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/417.png b/pokedex/data/media/pokemon/cropped/417.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/417.png rename to pokedex/data/media/pokemon/cropped/417.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/418.png b/pokedex/data/media/pokemon/cropped/418.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/418.png rename to pokedex/data/media/pokemon/cropped/418.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/419.png b/pokedex/data/media/pokemon/cropped/419.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/419.png rename to pokedex/data/media/pokemon/cropped/419.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/42.png b/pokedex/data/media/pokemon/cropped/42.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/42.png rename to pokedex/data/media/pokemon/cropped/42.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/420.png b/pokedex/data/media/pokemon/cropped/420.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/420.png rename to pokedex/data/media/pokemon/cropped/420.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/421-overcast.png b/pokedex/data/media/pokemon/cropped/421-overcast.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/421-overcast.png rename to pokedex/data/media/pokemon/cropped/421-overcast.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/421-sunshine.png b/pokedex/data/media/pokemon/cropped/421-sunshine.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/421-sunshine.png rename to pokedex/data/media/pokemon/cropped/421-sunshine.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/421.png b/pokedex/data/media/pokemon/cropped/421.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/421.png rename to pokedex/data/media/pokemon/cropped/421.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/422-east.png b/pokedex/data/media/pokemon/cropped/422-east.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/422-east.png rename to pokedex/data/media/pokemon/cropped/422-east.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/422-west.png b/pokedex/data/media/pokemon/cropped/422-west.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/422-west.png rename to pokedex/data/media/pokemon/cropped/422-west.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/422.png b/pokedex/data/media/pokemon/cropped/422.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/422.png rename to pokedex/data/media/pokemon/cropped/422.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/423-east.png b/pokedex/data/media/pokemon/cropped/423-east.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/423-east.png rename to pokedex/data/media/pokemon/cropped/423-east.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/423-west.png b/pokedex/data/media/pokemon/cropped/423-west.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/423-west.png rename to pokedex/data/media/pokemon/cropped/423-west.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/423.png b/pokedex/data/media/pokemon/cropped/423.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/423.png rename to pokedex/data/media/pokemon/cropped/423.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/424.png b/pokedex/data/media/pokemon/cropped/424.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/424.png rename to pokedex/data/media/pokemon/cropped/424.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/425.png b/pokedex/data/media/pokemon/cropped/425.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/425.png rename to pokedex/data/media/pokemon/cropped/425.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/426.png b/pokedex/data/media/pokemon/cropped/426.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/426.png rename to pokedex/data/media/pokemon/cropped/426.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/427.png b/pokedex/data/media/pokemon/cropped/427.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/427.png rename to pokedex/data/media/pokemon/cropped/427.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/428.png b/pokedex/data/media/pokemon/cropped/428.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/428.png rename to pokedex/data/media/pokemon/cropped/428.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/429.png b/pokedex/data/media/pokemon/cropped/429.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/429.png rename to pokedex/data/media/pokemon/cropped/429.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/43.png b/pokedex/data/media/pokemon/cropped/43.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/43.png rename to pokedex/data/media/pokemon/cropped/43.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/430.png b/pokedex/data/media/pokemon/cropped/430.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/430.png rename to pokedex/data/media/pokemon/cropped/430.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/431.png b/pokedex/data/media/pokemon/cropped/431.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/431.png rename to pokedex/data/media/pokemon/cropped/431.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/432.png b/pokedex/data/media/pokemon/cropped/432.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/432.png rename to pokedex/data/media/pokemon/cropped/432.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/433.png b/pokedex/data/media/pokemon/cropped/433.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/433.png rename to pokedex/data/media/pokemon/cropped/433.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/434.png b/pokedex/data/media/pokemon/cropped/434.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/434.png rename to pokedex/data/media/pokemon/cropped/434.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/435.png b/pokedex/data/media/pokemon/cropped/435.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/435.png rename to pokedex/data/media/pokemon/cropped/435.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/436.png b/pokedex/data/media/pokemon/cropped/436.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/436.png rename to pokedex/data/media/pokemon/cropped/436.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/437.png b/pokedex/data/media/pokemon/cropped/437.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/437.png rename to pokedex/data/media/pokemon/cropped/437.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/438.png b/pokedex/data/media/pokemon/cropped/438.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/438.png rename to pokedex/data/media/pokemon/cropped/438.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/439.png b/pokedex/data/media/pokemon/cropped/439.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/439.png rename to pokedex/data/media/pokemon/cropped/439.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/44.png b/pokedex/data/media/pokemon/cropped/44.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/44.png rename to pokedex/data/media/pokemon/cropped/44.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/440.png b/pokedex/data/media/pokemon/cropped/440.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/440.png rename to pokedex/data/media/pokemon/cropped/440.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/441.png b/pokedex/data/media/pokemon/cropped/441.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/441.png rename to pokedex/data/media/pokemon/cropped/441.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/442.png b/pokedex/data/media/pokemon/cropped/442.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/442.png rename to pokedex/data/media/pokemon/cropped/442.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/443.png b/pokedex/data/media/pokemon/cropped/443.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/443.png rename to pokedex/data/media/pokemon/cropped/443.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/444.png b/pokedex/data/media/pokemon/cropped/444.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/444.png rename to pokedex/data/media/pokemon/cropped/444.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/445.png b/pokedex/data/media/pokemon/cropped/445.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/445.png rename to pokedex/data/media/pokemon/cropped/445.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/446.png b/pokedex/data/media/pokemon/cropped/446.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/446.png rename to pokedex/data/media/pokemon/cropped/446.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/447.png b/pokedex/data/media/pokemon/cropped/447.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/447.png rename to pokedex/data/media/pokemon/cropped/447.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/448.png b/pokedex/data/media/pokemon/cropped/448.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/448.png rename to pokedex/data/media/pokemon/cropped/448.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/449.png b/pokedex/data/media/pokemon/cropped/449.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/449.png rename to pokedex/data/media/pokemon/cropped/449.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/45.png b/pokedex/data/media/pokemon/cropped/45.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/45.png rename to pokedex/data/media/pokemon/cropped/45.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/450.png b/pokedex/data/media/pokemon/cropped/450.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/450.png rename to pokedex/data/media/pokemon/cropped/450.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/451.png b/pokedex/data/media/pokemon/cropped/451.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/451.png rename to pokedex/data/media/pokemon/cropped/451.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/452.png b/pokedex/data/media/pokemon/cropped/452.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/452.png rename to pokedex/data/media/pokemon/cropped/452.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/453.png b/pokedex/data/media/pokemon/cropped/453.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/453.png rename to pokedex/data/media/pokemon/cropped/453.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/454.png b/pokedex/data/media/pokemon/cropped/454.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/454.png rename to pokedex/data/media/pokemon/cropped/454.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/455.png b/pokedex/data/media/pokemon/cropped/455.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/455.png rename to pokedex/data/media/pokemon/cropped/455.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/456.png b/pokedex/data/media/pokemon/cropped/456.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/456.png rename to pokedex/data/media/pokemon/cropped/456.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/457.png b/pokedex/data/media/pokemon/cropped/457.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/457.png rename to pokedex/data/media/pokemon/cropped/457.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/458.png b/pokedex/data/media/pokemon/cropped/458.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/458.png rename to pokedex/data/media/pokemon/cropped/458.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/459.png b/pokedex/data/media/pokemon/cropped/459.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/459.png rename to pokedex/data/media/pokemon/cropped/459.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/46.png b/pokedex/data/media/pokemon/cropped/46.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/46.png rename to pokedex/data/media/pokemon/cropped/46.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/460.png b/pokedex/data/media/pokemon/cropped/460.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/460.png rename to pokedex/data/media/pokemon/cropped/460.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/461.png b/pokedex/data/media/pokemon/cropped/461.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/461.png rename to pokedex/data/media/pokemon/cropped/461.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/462.png b/pokedex/data/media/pokemon/cropped/462.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/462.png rename to pokedex/data/media/pokemon/cropped/462.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/463.png b/pokedex/data/media/pokemon/cropped/463.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/463.png rename to pokedex/data/media/pokemon/cropped/463.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/464.png b/pokedex/data/media/pokemon/cropped/464.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/464.png rename to pokedex/data/media/pokemon/cropped/464.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/465.png b/pokedex/data/media/pokemon/cropped/465.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/465.png rename to pokedex/data/media/pokemon/cropped/465.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/466.png b/pokedex/data/media/pokemon/cropped/466.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/466.png rename to pokedex/data/media/pokemon/cropped/466.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/467.png b/pokedex/data/media/pokemon/cropped/467.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/467.png rename to pokedex/data/media/pokemon/cropped/467.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/468.png b/pokedex/data/media/pokemon/cropped/468.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/468.png rename to pokedex/data/media/pokemon/cropped/468.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/469.png b/pokedex/data/media/pokemon/cropped/469.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/469.png rename to pokedex/data/media/pokemon/cropped/469.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/47.png b/pokedex/data/media/pokemon/cropped/47.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/47.png rename to pokedex/data/media/pokemon/cropped/47.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/470.png b/pokedex/data/media/pokemon/cropped/470.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/470.png rename to pokedex/data/media/pokemon/cropped/470.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/471.png b/pokedex/data/media/pokemon/cropped/471.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/471.png rename to pokedex/data/media/pokemon/cropped/471.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/472.png b/pokedex/data/media/pokemon/cropped/472.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/472.png rename to pokedex/data/media/pokemon/cropped/472.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/473.png b/pokedex/data/media/pokemon/cropped/473.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/473.png rename to pokedex/data/media/pokemon/cropped/473.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/474.png b/pokedex/data/media/pokemon/cropped/474.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/474.png rename to pokedex/data/media/pokemon/cropped/474.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/475.png b/pokedex/data/media/pokemon/cropped/475.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/475.png rename to pokedex/data/media/pokemon/cropped/475.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/476.png b/pokedex/data/media/pokemon/cropped/476.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/476.png rename to pokedex/data/media/pokemon/cropped/476.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/477.png b/pokedex/data/media/pokemon/cropped/477.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/477.png rename to pokedex/data/media/pokemon/cropped/477.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/478.png b/pokedex/data/media/pokemon/cropped/478.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/478.png rename to pokedex/data/media/pokemon/cropped/478.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/479-fan.png b/pokedex/data/media/pokemon/cropped/479-fan.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/479-fan.png rename to pokedex/data/media/pokemon/cropped/479-fan.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/479-frost.png b/pokedex/data/media/pokemon/cropped/479-frost.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/479-frost.png rename to pokedex/data/media/pokemon/cropped/479-frost.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/479-heat.png b/pokedex/data/media/pokemon/cropped/479-heat.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/479-heat.png rename to pokedex/data/media/pokemon/cropped/479-heat.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/479-mow.png b/pokedex/data/media/pokemon/cropped/479-mow.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/479-mow.png rename to pokedex/data/media/pokemon/cropped/479-mow.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/479-wash.png b/pokedex/data/media/pokemon/cropped/479-wash.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/479-wash.png rename to pokedex/data/media/pokemon/cropped/479-wash.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/479.png b/pokedex/data/media/pokemon/cropped/479.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/479.png rename to pokedex/data/media/pokemon/cropped/479.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/48.png b/pokedex/data/media/pokemon/cropped/48.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/48.png rename to pokedex/data/media/pokemon/cropped/48.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/480.png b/pokedex/data/media/pokemon/cropped/480.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/480.png rename to pokedex/data/media/pokemon/cropped/480.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/481.png b/pokedex/data/media/pokemon/cropped/481.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/481.png rename to pokedex/data/media/pokemon/cropped/481.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/482.png b/pokedex/data/media/pokemon/cropped/482.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/482.png rename to pokedex/data/media/pokemon/cropped/482.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/483.png b/pokedex/data/media/pokemon/cropped/483.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/483.png rename to pokedex/data/media/pokemon/cropped/483.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/484.png b/pokedex/data/media/pokemon/cropped/484.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/484.png rename to pokedex/data/media/pokemon/cropped/484.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/485.png b/pokedex/data/media/pokemon/cropped/485.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/485.png rename to pokedex/data/media/pokemon/cropped/485.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/486.png b/pokedex/data/media/pokemon/cropped/486.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/486.png rename to pokedex/data/media/pokemon/cropped/486.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/487-altered.png b/pokedex/data/media/pokemon/cropped/487-altered.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/487-altered.png rename to pokedex/data/media/pokemon/cropped/487-altered.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/487-origin.png b/pokedex/data/media/pokemon/cropped/487-origin.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/487-origin.png rename to pokedex/data/media/pokemon/cropped/487-origin.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/487.png b/pokedex/data/media/pokemon/cropped/487.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/487.png rename to pokedex/data/media/pokemon/cropped/487.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/488.png b/pokedex/data/media/pokemon/cropped/488.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/488.png rename to pokedex/data/media/pokemon/cropped/488.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/489.png b/pokedex/data/media/pokemon/cropped/489.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/489.png rename to pokedex/data/media/pokemon/cropped/489.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/49.png b/pokedex/data/media/pokemon/cropped/49.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/49.png rename to pokedex/data/media/pokemon/cropped/49.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/490.png b/pokedex/data/media/pokemon/cropped/490.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/490.png rename to pokedex/data/media/pokemon/cropped/490.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/491.png b/pokedex/data/media/pokemon/cropped/491.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/491.png rename to pokedex/data/media/pokemon/cropped/491.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/492-land.png b/pokedex/data/media/pokemon/cropped/492-land.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/492-land.png rename to pokedex/data/media/pokemon/cropped/492-land.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/492-sky.png b/pokedex/data/media/pokemon/cropped/492-sky.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/492-sky.png rename to pokedex/data/media/pokemon/cropped/492-sky.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/492.png b/pokedex/data/media/pokemon/cropped/492.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/492.png rename to pokedex/data/media/pokemon/cropped/492.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-bug.png b/pokedex/data/media/pokemon/cropped/493-bug.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-bug.png rename to pokedex/data/media/pokemon/cropped/493-bug.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-dark.png b/pokedex/data/media/pokemon/cropped/493-dark.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-dark.png rename to pokedex/data/media/pokemon/cropped/493-dark.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-dragon.png b/pokedex/data/media/pokemon/cropped/493-dragon.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-dragon.png rename to pokedex/data/media/pokemon/cropped/493-dragon.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-electric.png b/pokedex/data/media/pokemon/cropped/493-electric.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-electric.png rename to pokedex/data/media/pokemon/cropped/493-electric.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-fighting.png b/pokedex/data/media/pokemon/cropped/493-fighting.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-fighting.png rename to pokedex/data/media/pokemon/cropped/493-fighting.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-fire.png b/pokedex/data/media/pokemon/cropped/493-fire.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-fire.png rename to pokedex/data/media/pokemon/cropped/493-fire.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-flying.png b/pokedex/data/media/pokemon/cropped/493-flying.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-flying.png rename to pokedex/data/media/pokemon/cropped/493-flying.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-ghost.png b/pokedex/data/media/pokemon/cropped/493-ghost.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-ghost.png rename to pokedex/data/media/pokemon/cropped/493-ghost.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-grass.png b/pokedex/data/media/pokemon/cropped/493-grass.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-grass.png rename to pokedex/data/media/pokemon/cropped/493-grass.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-ground.png b/pokedex/data/media/pokemon/cropped/493-ground.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-ground.png rename to pokedex/data/media/pokemon/cropped/493-ground.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-ice.png b/pokedex/data/media/pokemon/cropped/493-ice.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-ice.png rename to pokedex/data/media/pokemon/cropped/493-ice.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-normal.png b/pokedex/data/media/pokemon/cropped/493-normal.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-normal.png rename to pokedex/data/media/pokemon/cropped/493-normal.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-poison.png b/pokedex/data/media/pokemon/cropped/493-poison.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-poison.png rename to pokedex/data/media/pokemon/cropped/493-poison.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-psychic.png b/pokedex/data/media/pokemon/cropped/493-psychic.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-psychic.png rename to pokedex/data/media/pokemon/cropped/493-psychic.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-rock.png b/pokedex/data/media/pokemon/cropped/493-rock.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-rock.png rename to pokedex/data/media/pokemon/cropped/493-rock.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-steel.png b/pokedex/data/media/pokemon/cropped/493-steel.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-steel.png rename to pokedex/data/media/pokemon/cropped/493-steel.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-unknown.png b/pokedex/data/media/pokemon/cropped/493-unknown.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-unknown.png rename to pokedex/data/media/pokemon/cropped/493-unknown.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493-water.png b/pokedex/data/media/pokemon/cropped/493-water.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493-water.png rename to pokedex/data/media/pokemon/cropped/493-water.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/493.png b/pokedex/data/media/pokemon/cropped/493.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/493.png rename to pokedex/data/media/pokemon/cropped/493.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/494.png b/pokedex/data/media/pokemon/cropped/494.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/494.png rename to pokedex/data/media/pokemon/cropped/494.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/495.png b/pokedex/data/media/pokemon/cropped/495.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/495.png rename to pokedex/data/media/pokemon/cropped/495.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/496.png b/pokedex/data/media/pokemon/cropped/496.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/496.png rename to pokedex/data/media/pokemon/cropped/496.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/497.png b/pokedex/data/media/pokemon/cropped/497.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/497.png rename to pokedex/data/media/pokemon/cropped/497.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/498.png b/pokedex/data/media/pokemon/cropped/498.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/498.png rename to pokedex/data/media/pokemon/cropped/498.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/499.png b/pokedex/data/media/pokemon/cropped/499.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/499.png rename to pokedex/data/media/pokemon/cropped/499.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/5.png b/pokedex/data/media/pokemon/cropped/5.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/5.png rename to pokedex/data/media/pokemon/cropped/5.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/50.png b/pokedex/data/media/pokemon/cropped/50.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/50.png rename to pokedex/data/media/pokemon/cropped/50.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/500.png b/pokedex/data/media/pokemon/cropped/500.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/500.png rename to pokedex/data/media/pokemon/cropped/500.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/501.png b/pokedex/data/media/pokemon/cropped/501.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/501.png rename to pokedex/data/media/pokemon/cropped/501.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/502.png b/pokedex/data/media/pokemon/cropped/502.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/502.png rename to pokedex/data/media/pokemon/cropped/502.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/503.png b/pokedex/data/media/pokemon/cropped/503.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/503.png rename to pokedex/data/media/pokemon/cropped/503.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/504.png b/pokedex/data/media/pokemon/cropped/504.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/504.png rename to pokedex/data/media/pokemon/cropped/504.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/505.png b/pokedex/data/media/pokemon/cropped/505.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/505.png rename to pokedex/data/media/pokemon/cropped/505.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/506.png b/pokedex/data/media/pokemon/cropped/506.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/506.png rename to pokedex/data/media/pokemon/cropped/506.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/507.png b/pokedex/data/media/pokemon/cropped/507.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/507.png rename to pokedex/data/media/pokemon/cropped/507.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/508.png b/pokedex/data/media/pokemon/cropped/508.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/508.png rename to pokedex/data/media/pokemon/cropped/508.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/509.png b/pokedex/data/media/pokemon/cropped/509.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/509.png rename to pokedex/data/media/pokemon/cropped/509.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/51.png b/pokedex/data/media/pokemon/cropped/51.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/51.png rename to pokedex/data/media/pokemon/cropped/51.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/510.png b/pokedex/data/media/pokemon/cropped/510.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/510.png rename to pokedex/data/media/pokemon/cropped/510.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/511.png b/pokedex/data/media/pokemon/cropped/511.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/511.png rename to pokedex/data/media/pokemon/cropped/511.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/512.png b/pokedex/data/media/pokemon/cropped/512.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/512.png rename to pokedex/data/media/pokemon/cropped/512.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/513.png b/pokedex/data/media/pokemon/cropped/513.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/513.png rename to pokedex/data/media/pokemon/cropped/513.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/514.png b/pokedex/data/media/pokemon/cropped/514.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/514.png rename to pokedex/data/media/pokemon/cropped/514.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/515.png b/pokedex/data/media/pokemon/cropped/515.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/515.png rename to pokedex/data/media/pokemon/cropped/515.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/516.png b/pokedex/data/media/pokemon/cropped/516.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/516.png rename to pokedex/data/media/pokemon/cropped/516.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/517.png b/pokedex/data/media/pokemon/cropped/517.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/517.png rename to pokedex/data/media/pokemon/cropped/517.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/518.png b/pokedex/data/media/pokemon/cropped/518.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/518.png rename to pokedex/data/media/pokemon/cropped/518.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/519.png b/pokedex/data/media/pokemon/cropped/519.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/519.png rename to pokedex/data/media/pokemon/cropped/519.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/52.png b/pokedex/data/media/pokemon/cropped/52.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/52.png rename to pokedex/data/media/pokemon/cropped/52.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/520.png b/pokedex/data/media/pokemon/cropped/520.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/520.png rename to pokedex/data/media/pokemon/cropped/520.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/521.png b/pokedex/data/media/pokemon/cropped/521.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/521.png rename to pokedex/data/media/pokemon/cropped/521.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/522.png b/pokedex/data/media/pokemon/cropped/522.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/522.png rename to pokedex/data/media/pokemon/cropped/522.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/523.png b/pokedex/data/media/pokemon/cropped/523.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/523.png rename to pokedex/data/media/pokemon/cropped/523.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/524.png b/pokedex/data/media/pokemon/cropped/524.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/524.png rename to pokedex/data/media/pokemon/cropped/524.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/525.png b/pokedex/data/media/pokemon/cropped/525.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/525.png rename to pokedex/data/media/pokemon/cropped/525.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/526.png b/pokedex/data/media/pokemon/cropped/526.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/526.png rename to pokedex/data/media/pokemon/cropped/526.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/527.png b/pokedex/data/media/pokemon/cropped/527.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/527.png rename to pokedex/data/media/pokemon/cropped/527.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/528.png b/pokedex/data/media/pokemon/cropped/528.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/528.png rename to pokedex/data/media/pokemon/cropped/528.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/529.png b/pokedex/data/media/pokemon/cropped/529.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/529.png rename to pokedex/data/media/pokemon/cropped/529.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/53.png b/pokedex/data/media/pokemon/cropped/53.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/53.png rename to pokedex/data/media/pokemon/cropped/53.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/530.png b/pokedex/data/media/pokemon/cropped/530.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/530.png rename to pokedex/data/media/pokemon/cropped/530.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/531.png b/pokedex/data/media/pokemon/cropped/531.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/531.png rename to pokedex/data/media/pokemon/cropped/531.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/532.png b/pokedex/data/media/pokemon/cropped/532.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/532.png rename to pokedex/data/media/pokemon/cropped/532.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/533.png b/pokedex/data/media/pokemon/cropped/533.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/533.png rename to pokedex/data/media/pokemon/cropped/533.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/534.png b/pokedex/data/media/pokemon/cropped/534.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/534.png rename to pokedex/data/media/pokemon/cropped/534.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/535.png b/pokedex/data/media/pokemon/cropped/535.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/535.png rename to pokedex/data/media/pokemon/cropped/535.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/536.png b/pokedex/data/media/pokemon/cropped/536.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/536.png rename to pokedex/data/media/pokemon/cropped/536.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/537.png b/pokedex/data/media/pokemon/cropped/537.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/537.png rename to pokedex/data/media/pokemon/cropped/537.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/538.png b/pokedex/data/media/pokemon/cropped/538.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/538.png rename to pokedex/data/media/pokemon/cropped/538.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/539.png b/pokedex/data/media/pokemon/cropped/539.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/539.png rename to pokedex/data/media/pokemon/cropped/539.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/54.png b/pokedex/data/media/pokemon/cropped/54.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/54.png rename to pokedex/data/media/pokemon/cropped/54.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/540.png b/pokedex/data/media/pokemon/cropped/540.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/540.png rename to pokedex/data/media/pokemon/cropped/540.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/541.png b/pokedex/data/media/pokemon/cropped/541.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/541.png rename to pokedex/data/media/pokemon/cropped/541.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/542.png b/pokedex/data/media/pokemon/cropped/542.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/542.png rename to pokedex/data/media/pokemon/cropped/542.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/543.png b/pokedex/data/media/pokemon/cropped/543.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/543.png rename to pokedex/data/media/pokemon/cropped/543.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/544.png b/pokedex/data/media/pokemon/cropped/544.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/544.png rename to pokedex/data/media/pokemon/cropped/544.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/545.png b/pokedex/data/media/pokemon/cropped/545.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/545.png rename to pokedex/data/media/pokemon/cropped/545.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/546.png b/pokedex/data/media/pokemon/cropped/546.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/546.png rename to pokedex/data/media/pokemon/cropped/546.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/547.png b/pokedex/data/media/pokemon/cropped/547.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/547.png rename to pokedex/data/media/pokemon/cropped/547.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/548.png b/pokedex/data/media/pokemon/cropped/548.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/548.png rename to pokedex/data/media/pokemon/cropped/548.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/549.png b/pokedex/data/media/pokemon/cropped/549.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/549.png rename to pokedex/data/media/pokemon/cropped/549.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/55.png b/pokedex/data/media/pokemon/cropped/55.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/55.png rename to pokedex/data/media/pokemon/cropped/55.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/550-blue-striped.png b/pokedex/data/media/pokemon/cropped/550-blue-striped.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/550-blue-striped.png rename to pokedex/data/media/pokemon/cropped/550-blue-striped.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/550-red-striped.png b/pokedex/data/media/pokemon/cropped/550-red-striped.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/550-red-striped.png rename to pokedex/data/media/pokemon/cropped/550-red-striped.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/550.png b/pokedex/data/media/pokemon/cropped/550.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/550.png rename to pokedex/data/media/pokemon/cropped/550.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/551.png b/pokedex/data/media/pokemon/cropped/551.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/551.png rename to pokedex/data/media/pokemon/cropped/551.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/552.png b/pokedex/data/media/pokemon/cropped/552.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/552.png rename to pokedex/data/media/pokemon/cropped/552.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/553.png b/pokedex/data/media/pokemon/cropped/553.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/553.png rename to pokedex/data/media/pokemon/cropped/553.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/554.png b/pokedex/data/media/pokemon/cropped/554.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/554.png rename to pokedex/data/media/pokemon/cropped/554.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/555-standard.png b/pokedex/data/media/pokemon/cropped/555-standard.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/555-standard.png rename to pokedex/data/media/pokemon/cropped/555-standard.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/555-zen.png b/pokedex/data/media/pokemon/cropped/555-zen.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/555-zen.png rename to pokedex/data/media/pokemon/cropped/555-zen.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/555.png b/pokedex/data/media/pokemon/cropped/555.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/555.png rename to pokedex/data/media/pokemon/cropped/555.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/556.png b/pokedex/data/media/pokemon/cropped/556.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/556.png rename to pokedex/data/media/pokemon/cropped/556.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/557.png b/pokedex/data/media/pokemon/cropped/557.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/557.png rename to pokedex/data/media/pokemon/cropped/557.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/558.png b/pokedex/data/media/pokemon/cropped/558.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/558.png rename to pokedex/data/media/pokemon/cropped/558.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/559.png b/pokedex/data/media/pokemon/cropped/559.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/559.png rename to pokedex/data/media/pokemon/cropped/559.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/56.png b/pokedex/data/media/pokemon/cropped/56.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/56.png rename to pokedex/data/media/pokemon/cropped/56.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/560.png b/pokedex/data/media/pokemon/cropped/560.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/560.png rename to pokedex/data/media/pokemon/cropped/560.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/561.png b/pokedex/data/media/pokemon/cropped/561.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/561.png rename to pokedex/data/media/pokemon/cropped/561.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/562.png b/pokedex/data/media/pokemon/cropped/562.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/562.png rename to pokedex/data/media/pokemon/cropped/562.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/563.png b/pokedex/data/media/pokemon/cropped/563.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/563.png rename to pokedex/data/media/pokemon/cropped/563.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/564.png b/pokedex/data/media/pokemon/cropped/564.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/564.png rename to pokedex/data/media/pokemon/cropped/564.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/565.png b/pokedex/data/media/pokemon/cropped/565.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/565.png rename to pokedex/data/media/pokemon/cropped/565.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/566.png b/pokedex/data/media/pokemon/cropped/566.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/566.png rename to pokedex/data/media/pokemon/cropped/566.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/567.png b/pokedex/data/media/pokemon/cropped/567.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/567.png rename to pokedex/data/media/pokemon/cropped/567.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/568.png b/pokedex/data/media/pokemon/cropped/568.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/568.png rename to pokedex/data/media/pokemon/cropped/568.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/569.png b/pokedex/data/media/pokemon/cropped/569.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/569.png rename to pokedex/data/media/pokemon/cropped/569.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/57.png b/pokedex/data/media/pokemon/cropped/57.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/57.png rename to pokedex/data/media/pokemon/cropped/57.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/570.png b/pokedex/data/media/pokemon/cropped/570.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/570.png rename to pokedex/data/media/pokemon/cropped/570.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/571.png b/pokedex/data/media/pokemon/cropped/571.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/571.png rename to pokedex/data/media/pokemon/cropped/571.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/572.png b/pokedex/data/media/pokemon/cropped/572.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/572.png rename to pokedex/data/media/pokemon/cropped/572.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/573.png b/pokedex/data/media/pokemon/cropped/573.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/573.png rename to pokedex/data/media/pokemon/cropped/573.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/574.png b/pokedex/data/media/pokemon/cropped/574.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/574.png rename to pokedex/data/media/pokemon/cropped/574.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/575.png b/pokedex/data/media/pokemon/cropped/575.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/575.png rename to pokedex/data/media/pokemon/cropped/575.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/576.png b/pokedex/data/media/pokemon/cropped/576.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/576.png rename to pokedex/data/media/pokemon/cropped/576.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/577.png b/pokedex/data/media/pokemon/cropped/577.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/577.png rename to pokedex/data/media/pokemon/cropped/577.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/578.png b/pokedex/data/media/pokemon/cropped/578.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/578.png rename to pokedex/data/media/pokemon/cropped/578.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/579.png b/pokedex/data/media/pokemon/cropped/579.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/579.png rename to pokedex/data/media/pokemon/cropped/579.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/58.png b/pokedex/data/media/pokemon/cropped/58.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/58.png rename to pokedex/data/media/pokemon/cropped/58.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/580.png b/pokedex/data/media/pokemon/cropped/580.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/580.png rename to pokedex/data/media/pokemon/cropped/580.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/581.png b/pokedex/data/media/pokemon/cropped/581.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/581.png rename to pokedex/data/media/pokemon/cropped/581.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/582.png b/pokedex/data/media/pokemon/cropped/582.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/582.png rename to pokedex/data/media/pokemon/cropped/582.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/583.png b/pokedex/data/media/pokemon/cropped/583.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/583.png rename to pokedex/data/media/pokemon/cropped/583.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/584.png b/pokedex/data/media/pokemon/cropped/584.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/584.png rename to pokedex/data/media/pokemon/cropped/584.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/585-autumn.png b/pokedex/data/media/pokemon/cropped/585-autumn.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/585-autumn.png rename to pokedex/data/media/pokemon/cropped/585-autumn.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/585-spring.png b/pokedex/data/media/pokemon/cropped/585-spring.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/585-spring.png rename to pokedex/data/media/pokemon/cropped/585-spring.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/585-summer.png b/pokedex/data/media/pokemon/cropped/585-summer.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/585-summer.png rename to pokedex/data/media/pokemon/cropped/585-summer.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/585-winter.png b/pokedex/data/media/pokemon/cropped/585-winter.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/585-winter.png rename to pokedex/data/media/pokemon/cropped/585-winter.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/585.png b/pokedex/data/media/pokemon/cropped/585.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/585.png rename to pokedex/data/media/pokemon/cropped/585.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/586-autumn.png b/pokedex/data/media/pokemon/cropped/586-autumn.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/586-autumn.png rename to pokedex/data/media/pokemon/cropped/586-autumn.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/586-spring.png b/pokedex/data/media/pokemon/cropped/586-spring.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/586-spring.png rename to pokedex/data/media/pokemon/cropped/586-spring.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/586-summer.png b/pokedex/data/media/pokemon/cropped/586-summer.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/586-summer.png rename to pokedex/data/media/pokemon/cropped/586-summer.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/586-winter.png b/pokedex/data/media/pokemon/cropped/586-winter.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/586-winter.png rename to pokedex/data/media/pokemon/cropped/586-winter.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/586.png b/pokedex/data/media/pokemon/cropped/586.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/586.png rename to pokedex/data/media/pokemon/cropped/586.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/587.png b/pokedex/data/media/pokemon/cropped/587.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/587.png rename to pokedex/data/media/pokemon/cropped/587.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/588.png b/pokedex/data/media/pokemon/cropped/588.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/588.png rename to pokedex/data/media/pokemon/cropped/588.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/589.png b/pokedex/data/media/pokemon/cropped/589.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/589.png rename to pokedex/data/media/pokemon/cropped/589.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/59.png b/pokedex/data/media/pokemon/cropped/59.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/59.png rename to pokedex/data/media/pokemon/cropped/59.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/590.png b/pokedex/data/media/pokemon/cropped/590.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/590.png rename to pokedex/data/media/pokemon/cropped/590.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/591.png b/pokedex/data/media/pokemon/cropped/591.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/591.png rename to pokedex/data/media/pokemon/cropped/591.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/592.png b/pokedex/data/media/pokemon/cropped/592.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/592.png rename to pokedex/data/media/pokemon/cropped/592.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/593.png b/pokedex/data/media/pokemon/cropped/593.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/593.png rename to pokedex/data/media/pokemon/cropped/593.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/594.png b/pokedex/data/media/pokemon/cropped/594.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/594.png rename to pokedex/data/media/pokemon/cropped/594.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/595.png b/pokedex/data/media/pokemon/cropped/595.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/595.png rename to pokedex/data/media/pokemon/cropped/595.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/596.png b/pokedex/data/media/pokemon/cropped/596.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/596.png rename to pokedex/data/media/pokemon/cropped/596.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/597.png b/pokedex/data/media/pokemon/cropped/597.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/597.png rename to pokedex/data/media/pokemon/cropped/597.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/598.png b/pokedex/data/media/pokemon/cropped/598.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/598.png rename to pokedex/data/media/pokemon/cropped/598.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/599.png b/pokedex/data/media/pokemon/cropped/599.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/599.png rename to pokedex/data/media/pokemon/cropped/599.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/6.png b/pokedex/data/media/pokemon/cropped/6.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/6.png rename to pokedex/data/media/pokemon/cropped/6.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/60.png b/pokedex/data/media/pokemon/cropped/60.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/60.png rename to pokedex/data/media/pokemon/cropped/60.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/600.png b/pokedex/data/media/pokemon/cropped/600.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/600.png rename to pokedex/data/media/pokemon/cropped/600.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/601.png b/pokedex/data/media/pokemon/cropped/601.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/601.png rename to pokedex/data/media/pokemon/cropped/601.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/602.png b/pokedex/data/media/pokemon/cropped/602.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/602.png rename to pokedex/data/media/pokemon/cropped/602.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/603.png b/pokedex/data/media/pokemon/cropped/603.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/603.png rename to pokedex/data/media/pokemon/cropped/603.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/604.png b/pokedex/data/media/pokemon/cropped/604.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/604.png rename to pokedex/data/media/pokemon/cropped/604.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/605.png b/pokedex/data/media/pokemon/cropped/605.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/605.png rename to pokedex/data/media/pokemon/cropped/605.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/606.png b/pokedex/data/media/pokemon/cropped/606.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/606.png rename to pokedex/data/media/pokemon/cropped/606.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/607.png b/pokedex/data/media/pokemon/cropped/607.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/607.png rename to pokedex/data/media/pokemon/cropped/607.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/608.png b/pokedex/data/media/pokemon/cropped/608.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/608.png rename to pokedex/data/media/pokemon/cropped/608.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/609.png b/pokedex/data/media/pokemon/cropped/609.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/609.png rename to pokedex/data/media/pokemon/cropped/609.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/61.png b/pokedex/data/media/pokemon/cropped/61.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/61.png rename to pokedex/data/media/pokemon/cropped/61.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/610.png b/pokedex/data/media/pokemon/cropped/610.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/610.png rename to pokedex/data/media/pokemon/cropped/610.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/611.png b/pokedex/data/media/pokemon/cropped/611.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/611.png rename to pokedex/data/media/pokemon/cropped/611.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/612.png b/pokedex/data/media/pokemon/cropped/612.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/612.png rename to pokedex/data/media/pokemon/cropped/612.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/613.png b/pokedex/data/media/pokemon/cropped/613.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/613.png rename to pokedex/data/media/pokemon/cropped/613.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/614.png b/pokedex/data/media/pokemon/cropped/614.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/614.png rename to pokedex/data/media/pokemon/cropped/614.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/615.png b/pokedex/data/media/pokemon/cropped/615.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/615.png rename to pokedex/data/media/pokemon/cropped/615.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/616.png b/pokedex/data/media/pokemon/cropped/616.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/616.png rename to pokedex/data/media/pokemon/cropped/616.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/617.png b/pokedex/data/media/pokemon/cropped/617.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/617.png rename to pokedex/data/media/pokemon/cropped/617.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/618.png b/pokedex/data/media/pokemon/cropped/618.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/618.png rename to pokedex/data/media/pokemon/cropped/618.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/619.png b/pokedex/data/media/pokemon/cropped/619.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/619.png rename to pokedex/data/media/pokemon/cropped/619.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/62.png b/pokedex/data/media/pokemon/cropped/62.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/62.png rename to pokedex/data/media/pokemon/cropped/62.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/620.png b/pokedex/data/media/pokemon/cropped/620.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/620.png rename to pokedex/data/media/pokemon/cropped/620.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/621.png b/pokedex/data/media/pokemon/cropped/621.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/621.png rename to pokedex/data/media/pokemon/cropped/621.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/622.png b/pokedex/data/media/pokemon/cropped/622.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/622.png rename to pokedex/data/media/pokemon/cropped/622.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/623.png b/pokedex/data/media/pokemon/cropped/623.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/623.png rename to pokedex/data/media/pokemon/cropped/623.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/624.png b/pokedex/data/media/pokemon/cropped/624.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/624.png rename to pokedex/data/media/pokemon/cropped/624.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/625.png b/pokedex/data/media/pokemon/cropped/625.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/625.png rename to pokedex/data/media/pokemon/cropped/625.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/626.png b/pokedex/data/media/pokemon/cropped/626.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/626.png rename to pokedex/data/media/pokemon/cropped/626.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/627.png b/pokedex/data/media/pokemon/cropped/627.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/627.png rename to pokedex/data/media/pokemon/cropped/627.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/628.png b/pokedex/data/media/pokemon/cropped/628.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/628.png rename to pokedex/data/media/pokemon/cropped/628.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/629.png b/pokedex/data/media/pokemon/cropped/629.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/629.png rename to pokedex/data/media/pokemon/cropped/629.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/63.png b/pokedex/data/media/pokemon/cropped/63.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/63.png rename to pokedex/data/media/pokemon/cropped/63.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/630.png b/pokedex/data/media/pokemon/cropped/630.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/630.png rename to pokedex/data/media/pokemon/cropped/630.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/631.png b/pokedex/data/media/pokemon/cropped/631.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/631.png rename to pokedex/data/media/pokemon/cropped/631.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/632.png b/pokedex/data/media/pokemon/cropped/632.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/632.png rename to pokedex/data/media/pokemon/cropped/632.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/633.png b/pokedex/data/media/pokemon/cropped/633.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/633.png rename to pokedex/data/media/pokemon/cropped/633.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/634.png b/pokedex/data/media/pokemon/cropped/634.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/634.png rename to pokedex/data/media/pokemon/cropped/634.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/635.png b/pokedex/data/media/pokemon/cropped/635.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/635.png rename to pokedex/data/media/pokemon/cropped/635.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/636.png b/pokedex/data/media/pokemon/cropped/636.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/636.png rename to pokedex/data/media/pokemon/cropped/636.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/637.png b/pokedex/data/media/pokemon/cropped/637.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/637.png rename to pokedex/data/media/pokemon/cropped/637.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/638.png b/pokedex/data/media/pokemon/cropped/638.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/638.png rename to pokedex/data/media/pokemon/cropped/638.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/639.png b/pokedex/data/media/pokemon/cropped/639.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/639.png rename to pokedex/data/media/pokemon/cropped/639.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/64.png b/pokedex/data/media/pokemon/cropped/64.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/64.png rename to pokedex/data/media/pokemon/cropped/64.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/640.png b/pokedex/data/media/pokemon/cropped/640.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/640.png rename to pokedex/data/media/pokemon/cropped/640.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/641.png b/pokedex/data/media/pokemon/cropped/641.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/641.png rename to pokedex/data/media/pokemon/cropped/641.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/642.png b/pokedex/data/media/pokemon/cropped/642.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/642.png rename to pokedex/data/media/pokemon/cropped/642.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/643.png b/pokedex/data/media/pokemon/cropped/643.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/643.png rename to pokedex/data/media/pokemon/cropped/643.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/644.png b/pokedex/data/media/pokemon/cropped/644.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/644.png rename to pokedex/data/media/pokemon/cropped/644.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/645.png b/pokedex/data/media/pokemon/cropped/645.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/645.png rename to pokedex/data/media/pokemon/cropped/645.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/646.png b/pokedex/data/media/pokemon/cropped/646.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/646.png rename to pokedex/data/media/pokemon/cropped/646.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/647.png b/pokedex/data/media/pokemon/cropped/647.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/647.png rename to pokedex/data/media/pokemon/cropped/647.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/648-aria.png b/pokedex/data/media/pokemon/cropped/648-aria.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/648-aria.png rename to pokedex/data/media/pokemon/cropped/648-aria.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/648-pirouette.png b/pokedex/data/media/pokemon/cropped/648-pirouette.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/648-pirouette.png rename to pokedex/data/media/pokemon/cropped/648-pirouette.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/648.png b/pokedex/data/media/pokemon/cropped/648.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/648.png rename to pokedex/data/media/pokemon/cropped/648.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/649-burn.png b/pokedex/data/media/pokemon/cropped/649-burn.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/649-burn.png rename to pokedex/data/media/pokemon/cropped/649-burn.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/649-chill.png b/pokedex/data/media/pokemon/cropped/649-chill.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/649-chill.png rename to pokedex/data/media/pokemon/cropped/649-chill.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/649-douse.png b/pokedex/data/media/pokemon/cropped/649-douse.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/649-douse.png rename to pokedex/data/media/pokemon/cropped/649-douse.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/649-shock.png b/pokedex/data/media/pokemon/cropped/649-shock.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/649-shock.png rename to pokedex/data/media/pokemon/cropped/649-shock.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/649.png b/pokedex/data/media/pokemon/cropped/649.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/649.png rename to pokedex/data/media/pokemon/cropped/649.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/65.png b/pokedex/data/media/pokemon/cropped/65.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/65.png rename to pokedex/data/media/pokemon/cropped/65.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/66.png b/pokedex/data/media/pokemon/cropped/66.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/66.png rename to pokedex/data/media/pokemon/cropped/66.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/67.png b/pokedex/data/media/pokemon/cropped/67.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/67.png rename to pokedex/data/media/pokemon/cropped/67.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/68.png b/pokedex/data/media/pokemon/cropped/68.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/68.png rename to pokedex/data/media/pokemon/cropped/68.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/69.png b/pokedex/data/media/pokemon/cropped/69.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/69.png rename to pokedex/data/media/pokemon/cropped/69.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/7.png b/pokedex/data/media/pokemon/cropped/7.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/7.png rename to pokedex/data/media/pokemon/cropped/7.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/70.png b/pokedex/data/media/pokemon/cropped/70.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/70.png rename to pokedex/data/media/pokemon/cropped/70.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/71.png b/pokedex/data/media/pokemon/cropped/71.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/71.png rename to pokedex/data/media/pokemon/cropped/71.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/72.png b/pokedex/data/media/pokemon/cropped/72.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/72.png rename to pokedex/data/media/pokemon/cropped/72.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/73.png b/pokedex/data/media/pokemon/cropped/73.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/73.png rename to pokedex/data/media/pokemon/cropped/73.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/74.png b/pokedex/data/media/pokemon/cropped/74.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/74.png rename to pokedex/data/media/pokemon/cropped/74.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/75.png b/pokedex/data/media/pokemon/cropped/75.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/75.png rename to pokedex/data/media/pokemon/cropped/75.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/76.png b/pokedex/data/media/pokemon/cropped/76.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/76.png rename to pokedex/data/media/pokemon/cropped/76.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/77.png b/pokedex/data/media/pokemon/cropped/77.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/77.png rename to pokedex/data/media/pokemon/cropped/77.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/78.png b/pokedex/data/media/pokemon/cropped/78.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/78.png rename to pokedex/data/media/pokemon/cropped/78.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/79.png b/pokedex/data/media/pokemon/cropped/79.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/79.png rename to pokedex/data/media/pokemon/cropped/79.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/8.png b/pokedex/data/media/pokemon/cropped/8.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/8.png rename to pokedex/data/media/pokemon/cropped/8.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/80.png b/pokedex/data/media/pokemon/cropped/80.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/80.png rename to pokedex/data/media/pokemon/cropped/80.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/81.png b/pokedex/data/media/pokemon/cropped/81.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/81.png rename to pokedex/data/media/pokemon/cropped/81.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/82.png b/pokedex/data/media/pokemon/cropped/82.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/82.png rename to pokedex/data/media/pokemon/cropped/82.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/83.png b/pokedex/data/media/pokemon/cropped/83.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/83.png rename to pokedex/data/media/pokemon/cropped/83.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/84.png b/pokedex/data/media/pokemon/cropped/84.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/84.png rename to pokedex/data/media/pokemon/cropped/84.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/85.png b/pokedex/data/media/pokemon/cropped/85.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/85.png rename to pokedex/data/media/pokemon/cropped/85.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/86.png b/pokedex/data/media/pokemon/cropped/86.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/86.png rename to pokedex/data/media/pokemon/cropped/86.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/87.png b/pokedex/data/media/pokemon/cropped/87.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/87.png rename to pokedex/data/media/pokemon/cropped/87.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/88.png b/pokedex/data/media/pokemon/cropped/88.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/88.png rename to pokedex/data/media/pokemon/cropped/88.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/89.png b/pokedex/data/media/pokemon/cropped/89.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/89.png rename to pokedex/data/media/pokemon/cropped/89.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/9.png b/pokedex/data/media/pokemon/cropped/9.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/9.png rename to pokedex/data/media/pokemon/cropped/9.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/90.png b/pokedex/data/media/pokemon/cropped/90.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/90.png rename to pokedex/data/media/pokemon/cropped/90.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/91.png b/pokedex/data/media/pokemon/cropped/91.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/91.png rename to pokedex/data/media/pokemon/cropped/91.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/92.png b/pokedex/data/media/pokemon/cropped/92.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/92.png rename to pokedex/data/media/pokemon/cropped/92.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/93.png b/pokedex/data/media/pokemon/cropped/93.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/93.png rename to pokedex/data/media/pokemon/cropped/93.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/94.png b/pokedex/data/media/pokemon/cropped/94.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/94.png rename to pokedex/data/media/pokemon/cropped/94.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/95.png b/pokedex/data/media/pokemon/cropped/95.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/95.png rename to pokedex/data/media/pokemon/cropped/95.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/96.png b/pokedex/data/media/pokemon/cropped/96.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/96.png rename to pokedex/data/media/pokemon/cropped/96.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/97.png b/pokedex/data/media/pokemon/cropped/97.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/97.png rename to pokedex/data/media/pokemon/cropped/97.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/98.png b/pokedex/data/media/pokemon/cropped/98.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/98.png rename to pokedex/data/media/pokemon/cropped/98.png diff --git a/pokedex/data/media/pokemon/cropped-pokemon/99.png b/pokedex/data/media/pokemon/cropped/99.png similarity index 100% rename from pokedex/data/media/pokemon/cropped-pokemon/99.png rename to pokedex/data/media/pokemon/cropped/99.png