Revert ea9ba00..5e63ceb

This rolls back to commit ea9ba0037ff334318bb8f62518a82e43cb768f63.
Edited the file structure