Prettify and moved some resources around
Added new resource folders