Changed Project Structure to include modules