Still working but better folder structure