Reorganized app folder, reduced package dependencies