Cleaned up files and moved to properly named directory