Fixes typo
Style and files structure fixes