Initial pull request.

Renamed files and moved them into new folders.