Added dependencies and re-sorted

Added dependencies and re-sorted files