Organize files into directories

Update htaccess to remove directory from URLs