Improved naming and moved some files into the correct folders