Moving everything to single file