Fixed Bugs, organized Files