Updated Source Code Structure