FIxing styles
FIxing styles and file structure