Removed Express, and rebuilt folder structure