Improved directory Structure

Removed main directory and unused functions