Updated Project Structure to increase readability