Changed Project Structure. Fixed Errors.