Better structure directory wise, cleaned up files a bit more