add layouts and includes for proper structuring